diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2005-12-07 07:02:35 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gcc.gnu.org> | 2005-12-07 17:32:35 +1030 |
| commit | 5e4f1974e4c0e91a213bbd816c15d5a613b0c1d2 (patch) | |
| tree | 07602a827148666a3b70b1e3389e4e42a76fd640 /gcc | |
| parent | a6d63770073249b66da8eb16a0f698c755a2de6f (diff) | |
| download | gcc-5e4f1974e4c0e91a213bbd816c15d5a613b0c1d2.zip gcc-5e4f1974e4c0e91a213bbd816c15d5a613b0c1d2.tar.gz gcc-5e4f1974e4c0e91a213bbd816c15d5a613b0c1d2.tar.bz2 | |
gcc.c (init_gcc_specs): Match braces inside conditionally compiled strings.
* gcc.c (init_gcc_specs): Match braces inside conditionally
compiled strings.
From-SVN: r108151
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/gcc.c | 31 |
2 files changed, 23 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 61970e6..d913d40 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Alan Modra <amodra@bigpond.net.au> + + * gcc.c (init_gcc_specs): Match braces inside conditionally + compiled strings. + 2005-12-06 Geoffrey Keating <geoffk@apple.com> * config/darwin.h (TARGET_CXX_CLASS_DATA_ALWAYS_COMDAT): New. @@ -1600,25 +1600,30 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name, { char *buf; - buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, - "}%{!static:%{!static-libgcc:", + buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, "}" + "%{!static:%{!static-libgcc:" #if USE_LD_AS_NEEDED - "%{!shared-libgcc:", static_name, - " --as-needed ", shared_name, " --no-as-needed}" - "%{shared-libgcc:", shared_name, "%{!shared: ", static_name, - "}", + "%{!shared-libgcc:", + static_name, " --as-needed ", shared_name, " --no-as-needed" + "}" + "%{shared-libgcc:", + shared_name, "%{!shared: ", static_name, "}" + "}" #else - "%{!shared:%{!shared-libgcc:", static_name, " ", - eh_name, "}%{shared-libgcc:", shared_name, " ", - static_name, "}}%{shared:", + "%{!shared:" + "%{!shared-libgcc:", static_name, " ", eh_name, "}" + "%{shared-libgcc:", shared_name, " ", static_name, "}" + "}" #ifdef LINK_EH_SPEC - "%{shared-libgcc:", shared_name, - "}%{!shared-libgcc:", static_name, "}", + "%{shared:" + "%{shared-libgcc:", shared_name, "}" + "%{!shared-libgcc:", static_name, "}" + "}" #else - shared_name, + "%{shared:", shared_name, "}" #endif #endif - "}}}", NULL); + "}}", NULL); obstack_grow (obstack, buf, strlen (buf)); free (buf); |