lang-specs.h (c++): When invoking the stand-alone preprocessor for -save-temps...

* lang-specs.h (c++): When invoking the stand-alone preprocessor
for -save-temps, pass all relevant -Defines to it, and then don't
pass them to cc1plus.

From-SVN: r38067

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7358f65cbeb44c6a56bc2f2977878048c5f5e76d..585e8154a8fe422741bbdd687c51abf0bee36e52 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-06  Alexandre Oliva  <aoliva@redhat.com>
+
+       * lang-specs.h (c++): When invoking the stand-alone preprocessor
+       for -save-temps, pass all relevant -Defines to it, and then don't
+       pass them to cc1plus.
+
 2000-12-05  Will Cohen  <wcohen@redhat.com>
 
        * decl.c (finish_case_label): Cleared

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 7e83eec286f1cea52c4ba428b67b7aed5db7d847..716a93bd6dcd8cd3b5a108cfea9582767b23eef3 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -33,15 +33,19 @@ Boston, MA 02111-1307, USA.  */
       the external preprocessor if -save-temps is given.  */
     "%{E|M|MM:cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
        %{fnew-abi:-D__GXX_ABI_VERSION=100}\
-       %{ansi:-trigraphs -$ -D__STRICT_ANSI__} %(cpp_options)}\
+       %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options)}\
      %{!E:%{!M:%{!MM:\
-       %{save-temps:cpp0 -lang-c++ %{ansi:-trigraphs -$ -D__STRICT_ANSI__}\
+       %{save-temps:cpp0 -lang-c++ \
+                   %{!no-gcc:-D__GNUG__=%v1}\
+                   %{fnew-abi:-D__GXX_ABI_VERSION=100}\
+                   %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
                    %(cpp_options) %b.ii \n}\
       cc1plus %{save-temps:-fpreprocessed %b.ii}\
-              %{!save-temps:%(cpp_options)}\
-       %{!no-gcc:-D__GNUG__=%v1}\
-       %{fnew-abi:-D__GXX_ABI_VERSION=100}\
-       %{ansi:-trigraphs -$ -D__STRICT_ANSI__}\
+              %{!save-temps:%(cpp_options)\
+                           %{!no-gcc:-D__GNUG__=%v1}\
+                           %{fnew-abi:-D__GXX_ABI_VERSION=100}\
+                           %{ansi:-D__STRICT_ANSI__}}\
+       %{ansi:-trigraphs -$}\
        %(cc1_options) %2 %{+e*}\
        %{!fsyntax-only:%(invoke_as)}}}}"},
   {".ii", "@c++-cpp-output"},