[src/trunk]: src/external/gpl3/gcc/dist/gcc fix a merge error with LIBGCC_PIC...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64eedc140fe4
branches:  trunk
changeset: 766617:64eedc140fe4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 29 02:12:29 2011 +0000

description:
fix a merge error with LIBGCC_PIC_SUFFIX code.

diffstat:

 external/gpl3/gcc/dist/gcc/gcc.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 13ae7ca5ce39 -r 64eedc140fe4 external/gpl3/gcc/dist/gcc/gcc.c
--- a/external/gpl3/gcc/dist/gcc/gcc.c  Wed Jun 29 02:05:24 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/gcc.c  Wed Jun 29 02:12:29 2011 +0000
@@ -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,