aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJie Zhang <jie@codesourcery.com>2011-01-04 10:21:27 +0000
committerJie Zhang <jiez@gcc.gnu.org>2011-01-04 10:21:27 +0000
commita0d43bacfc2613acd3fc75621d85611588591d8a (patch)
treeadf920ca0bcf5334cef3eb2da315057ac5eb1725 /gcc
parent2d3c7e4f2d3c39f0ff5f0bcf0c5d97e0d7a893dc (diff)
downloadgcc-a0d43bacfc2613acd3fc75621d85611588591d8a.zip
gcc-a0d43bacfc2613acd3fc75621d85611588591d8a.tar.gz
gcc-a0d43bacfc2613acd3fc75621d85611588591d8a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gcc.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f22250b..495ec38 100644
--- 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 25d2b06..9ec7d4e 100644
--- 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. */