Module Name: src
Committed By: mrg
Date: Wed Jun 29 02:12:29 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c
Log Message:
fix a merge error with LIBGCC_PIC_SUFFIX code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/gcc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/gcc.c
diff -u src/external/gpl3/gcc/dist/gcc/gcc.c:1.4 src/external/gpl3/gcc/dist/gcc/gcc.c:1.5
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.4 Tue Jun 28 07:52:40 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c Wed Jun 29 02:12:29 2011
@@ -1766,17 +1766,11 @@
"}"
"%{!static:%{!static-libgcc:"
#if USE_LD_AS_NEEDED
- "%{!shared:"
"%{!shared-libgcc:",
static_name, " --as-needed ", shared_name, " --no-as-needed"
"}"
"%{shared-libgcc:",
- shared_name, "%{!shared: ", static_name, "}"
- "}"
- "}"
- "%{shared:"
- "%{shared-libgcc: --as-needed", shared_name, " --no-as-needed} ",
- "%{!shared-libgcc:", static_name,
+ shared_name, "%{!shared: ", static_name,
#ifdef LIBGCC_PICSUFFIX
LIBGCC_PICSUFFIX,
#endif
@@ -1787,7 +1781,8 @@
"%{!shared-libgcc:", static_name, " ", eh_name, "}"
"%{shared-libgcc:", shared_name, " ", static_name, "}"
"}"
-#ifdef LINK_EH_SPEC
+/* XXX NH XXX */
+#ifdef LINK_EH_SPEC || 1
"%{shared:"
"%{shared-libgcc:", shared_name, "}"
"%{!shared-libgcc:", static_name,
