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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61970e69f79f65b7265128945fa0e3fdda7793c1..d913d40f424a1d95e8104b094a1e29f2456ad002 100644 (file)
--- 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 1e0a2bf3be0200c6fc8a6ae012e62ffc62219ebb..f89e51bb479a2d229342067c23d5d463a1d082f2 100644 (file)
--- 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);