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
This commit is contained in:
parent
a6d6377007
commit
5e4f1974e4
|
@ -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.
|
||||
|
|
31
gcc/gcc.c
31
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);
|
||||
|
|
Loading…
Reference in New Issue