From d4064840f6ce759ab1dd31e357ee5f20280496a5 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Sat, 13 Mar 2004 00:45:39 +0000 Subject: [PATCH] backport: re PR driver/13577 (multiple -o options with -c cause unrecognized option `-strip') Backport: 2004-03-05 Nathan Sidwell PR driver/13577 * gcc.c (cc1_options): Robustify -auxbase-strip from multiple -o options. From-SVN: r79422 --- gcc/ChangeLog | 8 ++++++++ gcc/gcc.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6583ae2246f0..6b14ab0997e5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-03-12 Gabriel Dos Reis + + Backport: + 2004-03-05 Nathan Sidwell + PR driver/13577 + * gcc.c (cc1_options): Robustify -auxbase-strip from multiple -o + options. + 2004-03-12 Gabriel Dos Reis Endorse: diff --git a/gcc/gcc.c b/gcc/gcc.c index e3a7a5d17606..86fb2eb4ed55 100644 --- 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}\ -- 2.47.2