backport: re PR driver/13577 (multiple -o options with -c cause unrecognized option...

	Backport:
	2004-03-05  Nathan Sidwell  <nathan@codesourcery.com>
	PR driver/13577
	* gcc.c (cc1_options): Robustify -auxbase-strip from multiple -o
	options.

From-SVN: r79422

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6583ae2246f0f099ea210496c64435a33528b35f..6b14ab0997e52b66af23859a03f8e8512c8be31e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       Backport:
+       2004-03-05  Nathan Sidwell  <nathan@codesourcery.com>
+       PR driver/13577
+       * gcc.c (cc1_options): Robustify -auxbase-strip from multiple -o
+       options.
+
 2004-03-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
         
         Endorse:

diff --git a/gcc/gcc.c b/gcc/gcc.c
index e3a7a5d1760657bd486d20f66f979c72cd81754d..86fb2eb4ed55ec884c06d1155632832f49604fe7 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -732,7 +732,7 @@ static const char *cpp_debug_options = "%{d*}";
 static const char *cc1_options =
 "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
  %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
- -auxbase%{c|S:%{o*:-strip %*}%{!o*: %b}}%{!c:%{!S: %b}}\
+ %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
  %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\
  %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
  %{Qn:-fno-ident} %{--help:--help}\