[src/trunk]: src/external/gpl3/gcc/lib/libgcc/libgcc Avoid using ld -x. Inst...

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

details:   https://anonhg.NetBSD.org/src/rev/8daee37fa672
branches:  trunk
changeset: 333412:8daee37fa672
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Nov 02 14:54:27 2014 +0000

description:
Avoid using ld -x.  Instead use ${OBJCOPY} ${OBJCOPYLIBFLAGS} to string
local symbols.

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc/Makefile |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 17b57884c75e -r 8daee37fa672 external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Sun Nov 02 11:28:03 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Sun Nov 02 14:54:27 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.23 2014/11/02 14:54:27 matt Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -50,11 +50,12 @@
        ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
        ${NM} -pg ${.TARGET}.tmp1 | \
            ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
-           ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+           ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+       ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
 .if defined(COPTS) && !empty(COPTS:M*-g*)
        mv ${.TARGET}.tmp2 ${.TARGET}
 .else
-       ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+       ${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
        rm -f ${.TARGET}.tmp2
 .endif
        rm -f ${.TARGET}.tmp1
@@ -64,11 +65,12 @@
        ${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
        ${NM} -pg ${.TARGET}.tmp1 | \
            ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
-           ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+           ${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+       ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
 .if defined(COPTS) && !empty(COPTS:M*-g*)
        mv ${.TARGET}.tmp2 ${.TARGET}
 .else
-       ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+       ${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
        rm -f ${.TARGET}.tmp2
 .endif
        rm -f ${.TARGET}.tmp1