diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-07 07:02:35 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-07 07:02:35 +0000 |
| commit | e885c83264bad15fe57462a7eeb88edb91bf006a (patch) | |
| tree | 07602a827148666a3b70b1e3389e4e42a76fd640 /gcc | |
| parent | 937fb015e6bb7e6ba6e01b9afe372995574d957c (diff) | |
| download | gcc-e885c83264bad15fe57462a7eeb88edb91bf006a.tar.gz | |
* gcc.c (init_gcc_specs): Match braces inside conditionally
compiled strings.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108151 138bc75d-0d04-0410-961f-82ee72b054a4
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 61970e69f79..d913d40f424 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. diff --git a/gcc/gcc.c b/gcc/gcc.c index 1e0a2bf3be0..f89e51bb479 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -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); |