[src/trunk]: src/share/mk Back changes from 1.349 on since the -Wl, -x bug has...

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

details:   https://anonhg.NetBSD.org/src/rev/e0b2c59ee935
branches:  trunk
changeset: 328647:e0b2c59ee935
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Apr 11 16:51:43 2014 +0000

description:
Back changes from 1.349 on since the -Wl,-x bug has been fixed in binutils.

diffstat:

 share/mk/bsd.lib.mk |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (40 lines):

diff -r 8b92164e91d4 -r e0b2c59ee935 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Fri Apr 11 16:32:12 2014 +0000
+++ b/share/mk/bsd.lib.mk       Fri Apr 11 16:51:43 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.352 2014/04/11 15:56:09 christos Exp $
+#      $NetBSD: bsd.lib.mk,v 1.353 2014/04/11 16:51:43 matt Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -618,17 +618,10 @@
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
        ${_MKTARGET_BUILD}
        rm -f ${.TARGET}
-       ${LIBCC} ${LDLIBC} -shared ${SHLIB_SHFLAGS} \
+       ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
            ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
            -Wl,--whole-archive ${SOLIB} \
            -Wl,--no-whole-archive ${_LDADD.${_LIB}}
-# XXX[1]: When the arm linker bug where -Wl,-x eats $a,$d,$t from shared
-# libraries remove the following conditional and put this back in the linker
-# line. For now we delay stripping symbols until the debug split step or skip
-# it alltogether if we are using -g
-.if !defined(_LIB.so.debug) && !empty(CFLAGS:M*-g*)
-       ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
 #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX
@@ -646,10 +639,8 @@
 .if defined(_LIB.so.debug)
 ${_LIB.so.debug}: ${_LIB.so.full}
        ${_MKTARGET_CREATE}
-# XXX[2]: OBJCOPYLIBFLAGS is used to strip the symbols because it was not
-# done above.
        (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
-       && ${OBJCOPY} ${OBJCOPYLIBFLAGS} --strip-debug -p -R .gnu_debuglink \
+       && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
                --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
        ) || (rm -f ${.TARGET}; false)
 .endif