[src/trunk]: src/share/mk Back out change for bsd.lib.mk which skips objcopy ...

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

details:   https://anonhg.NetBSD.org/src/rev/064951396e9a
branches:  trunk
changeset: 792028:064951396e9a
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 16 21:34:16 2013 +0000

description:
Back out change for bsd.lib.mk which skips objcopy -x for BE ARM.
Change OBJCOPYLIBFLAGS to keep $a/$d/$t symbols on BE ARM.

diffstat:

 share/mk/bsd.lib.mk |  6 +-----
 share/mk/bsd.sys.mk |  6 ++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r c5637ff440d0 -r 064951396e9a share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Mon Dec 16 20:17:34 2013 +0000
+++ b/share/mk/bsd.lib.mk       Mon Dec 16 21:34:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.343 2013/12/13 02:47:45 matt Exp $
+#      $NetBSD: bsd.lib.mk,v 1.344 2013/12/16 21:34:16 matt Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -188,9 +188,6 @@
 .endif
 .endif
 
-.if empty(MACHINE_ARCH:Mearmv7*eb)
-# These will remove $a/$d/$t symbols needed for linking ARM BE8 images so
-# we can't strip them out.
 LIBSTRIPAOBJS= yes
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
 LIBSTRIPCOBJS= yes
@@ -204,7 +201,6 @@
 .if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*) 
 LIBSTRIPSHLIBOBJS=     yes
 .endif
-.endif
 
 .c.o:
        ${_MKTARGET_COMPILE}
diff -r c5637ff440d0 -r 064951396e9a share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Mon Dec 16 20:17:34 2013 +0000
+++ b/share/mk/bsd.sys.mk       Mon Dec 16 21:34:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.230 2013/11/06 19:57:17 christos Exp $
+#      $NetBSD: bsd.sys.mk,v 1.231 2013/12/16 21:34:16 matt Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -271,6 +271,8 @@
 .endif
 
 # Objcopy
-OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x}
+# ARM big endian needs to preserve $a/$d/$t symbols for the linker.
+OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} \
+       ${"${MACHINE_ARCH:M*arm*eb}" != "":?-K '\$a' -K '\$d' -K '\$t':}
 
 .endif # !defined(_BSD_SYS_MK_)