From: Alan Modra <amodra@bigpond.net.au>
Date: Wed, 7 Dec 2005 07:02:35 +0000 (+0000)
Subject: gcc.c (init_gcc_specs): Match braces inside conditionally compiled strings.
X-Git-Tag: releases/gcc-4.2.0~5536
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e4f1974e4c0e91a213bbd816c15d5a613b0c1d2;p=thirdparty%2Fgcc.git

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 61970e69f79f..d913d40f424a 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 1e0a2bf3be02..f89e51bb479a 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);