Module Name: src
Committed By: matt
Date: Mon Dec 16 21:34:16 UTC 2013
Modified Files:
src/share/mk: bsd.lib.mk bsd.sys.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.230 -r1.231 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.343 src/share/mk/bsd.lib.mk:1.344
--- src/share/mk/bsd.lib.mk:1.343 Fri Dec 13 02:47:45 2013
+++ src/share/mk/bsd.lib.mk Mon Dec 16 21:34:16 2013
@@ -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 @@ CTFFLAGS+= -g
.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 @@ LIBSTRIPFOBJS= yes
.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
LIBSTRIPSHLIBOBJS= yes
.endif
-.endif
.c.o:
${_MKTARGET_COMPILE}
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.230 src/share/mk/bsd.sys.mk:1.231
--- src/share/mk/bsd.sys.mk:1.230 Wed Nov 6 19:57:17 2013
+++ src/share/mk/bsd.sys.mk Mon Dec 16 21:34:16 2013
@@ -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 @@ YFLAGS+= ${YPREFIX:D-p${YPREFIX}} ${YHEA
.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_)
