re PR driver/47137 (gcc incorrectly combines assembly inputs)

	PR driver/47137
	* gcc.c (default_compilers[]): Set combinable field to 0
	for all assembly languages.

From-SVN: r168459

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f22250bffe4b771f411edc19ce0ad074657a1a0e..495ec3851e8ae5bc0648855b1df409e9fe40cede 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-04  Jie Zhang  <jie@codesourcery.com>
+
+       PR driver/47137
+       * gcc.c (default_compilers[]): Set combinable field to 0
+       for all assembly languages.
+
 2011-01-04  Mingjie Xing  <mingjie.xing@gmail.com>
 
        * config/mips/loongson3a.md: New file.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 25d2b06f51e6658e02eadb18c367185c587517df..9ec7d4e4f142f845ab749f978d1e59d30829ba33 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -935,11 +935,11 @@ static const struct compiler default_compilers[] =
   {".i", "@cpp-output", 0, 0, 0},
   {"@cpp-output",
    "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
-  {".s", "@assembler", 0, 1, 0},
+  {".s", "@assembler", 0, 0, 0},
   {"@assembler",
-   "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
-  {".sx", "@assembler-with-cpp", 0, 1, 0},
-  {".S", "@assembler-with-cpp", 0, 1, 0},
+   "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
+  {".sx", "@assembler-with-cpp", 0, 0, 0},
+  {".S", "@assembler-with-cpp", 0, 0, 0},
   {"@assembler-with-cpp",
 #ifdef AS_NEEDS_DASH_FOR_PIPED_INPUT
    "%(trad_capable_cpp) -lang-asm %(cpp_options) -fno-directives-only\
@@ -952,7 +952,7 @@ static const struct compiler default_compilers[] =
       %{!M:%{!MM:%{!E:%{!S:-o %|.s |\n\
        as %(asm_debug) %(asm_options) %m.s %A }}}}"
 #endif
-   , 0, 1, 0},
+   , 0, 0, 0},
 
 #include "specs.h"
   /* Mark end of table.  */