rs6000.c (expand_block_move): Unify the TARGET_STRING and ! TARGET_STRING cases.

	* config/rs6000/rs6000.c (expand_block_move): Unify the TARGET_STRING
	and ! TARGET_STRING cases.

From-SVN: r67140

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 286e3c74bef744326747f19b89e6f37b5d3d3319..d4334528b6b83263dd48606f847409464ea2c34b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-23  Geoffrey Keating  <geoffk@apple.com>
+
+       * gcc.c (default_compilers): Use -o to specify preprocessor's output
+       file.  Make -no-integrated-cpp work when building PCH files.
+       * objc/lang-specs.h: Likewise.
+
 2003-05-23  Nathanael Nerode  <neroden@gcc.gnu.org>
 
        * fixinc/Makefile.in: Correct description.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 238f56e2f9e014e7d698f4ab2b2b4493782c870c..98f4f7143bcf3e87ea44e63470e56a99e55931d0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-23  Geoffrey Keating  <geoffk@apple.com>
+
+       * lang-specs.h: Use -o to specify preprocessor's output file.
+       Make -no-integrated-cpp work when building PCH files.
+
 2003-05-23  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/10682

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 8a871d8196cddb787c28190ffd4eb53879875ad6..5815ea57896e1e23e7ed8eedd235a7c58e59e2c9 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -38,10 +38,10 @@ Boston, MA 02111-1307, USA.  */
   {"@c++-header",
     "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\
      %{!E:%{!M:%{!MM:\
-       %{save-temps:cc1plus -E\
-               %(cpp_options) %2 %b.ii \n}\
-      cc1plus %{save-temps:-fpreprocessed %b.ii}\
-             %{!save-temps:%(cpp_unique_options)}\
+       %{save-temps|no-integrated-cpp:cc1plus -E\
+               %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+      cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+             %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
        %(cc1_options) %2 %{+e1*}\
         -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
      CPLUSPLUS_CPP_SPEC},
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.  */
     "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\
      %{!E:%{!M:%{!MM:\
        %{save-temps|no-integrated-cpp:cc1plus -E\
-               %(cpp_options) %2 %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+               %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
              %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
        %(cc1_options) %2 %{+e1*}\

diff --git a/gcc/gcc.c b/gcc/gcc.c
index a44ca213d6e2bf5bad9743e8111679697e0d8cc2..1b79f5486b7b3d018bfde3dbd29dfa86130d30b2 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -881,8 +881,9 @@ static const struct compiler default_compilers[] =
           %{traditional|ftraditional:\
 %eGNU C no longer supports -traditional without -E}\
          %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
-               %(cpp_options) %{save-temps:%b.i} %{!save-temps:%g.i} \n\
-                   cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} %(cc1_options)}\
+               %(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\
+                   cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} \
+                       %(cc1_options)}\
          %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
                cc1 %(cpp_unique_options) %(cc1_options)}}}\
         %{!fsyntax-only:%(invoke_as)}}}}", 0},
@@ -895,15 +896,16 @@ static const struct compiler default_compilers[] =
       external preprocessor if -save-temps is given.  */
      "%{E|M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
       %{!E:%{!M:%{!MM:\
-         %{save-temps|traditional-cpp:%(trad_capable_cpp) \
-               %(cpp_options) %b.i \n\
-                   cc1 -fpreprocessed %b.i %(cc1_options)\
+         %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+               %(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\
+                   cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} \
+                       %(cc1_options)\
                         -o %g.s %{!o*:--output-pch=%i.gch}\
                         %W{o*:--output-pch=%*}%V}\
-         %{!save-temps:%{!traditional-cpp:\
+         %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
                cc1 %(cpp_unique_options) %(cc1_options)\
                     -o %g.s %{!o*:--output-pch=%i.gch}\
-                    %W{o*:--output-pch=%*}%V}}}}}", 0},
+                    %W{o*:--output-pch=%*}%V}}}}}}", 0},
   {".i", "@cpp-output", 0},
   {"@cpp-output",
    "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0},

diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 0e7a46f5dae31f7ce0bab123a30c0fde1aa90469..7c784204f86c7ce90d6def3d544af33a0982dfee 100644 (file)
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
       %{!E:%{!M:%{!MM:\
        %{traditional|ftraditional|traditional-cpp:\
 %eGNU Objective C no longer supports traditional compilation}\
-       %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
+       %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
            cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{gen-decls}}\
        %{!save-temps:%{!no-integrated-cpp:\
            cc1obj %(cpp_unique_options) %(cc1_options) %{gen-decls}}}\
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA.  */
       %{!E:%{!M:%{!MM:\
        %{traditional|ftraditional|traditional-cpp:\
 %eGNU Objective C no longer supports traditional compilation}\
-       %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) %b.mi \n\
+       %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
            cc1obj -fpreprocessed %b.mi %(cc1_options) %{gen-decls}\
                         -o %g.s %{!o*:--output-pch=%i.gch}\
                         %W{o*:--output-pch=%*}%V}\