Module Name: src
Committed By: snj
Date: Tue Jan 5 22:22:36 UTC 2016
Modified Files:
src/share/mk [netbsd-7]: bsd.sys.mk
src/sys/arch/aarch64/conf [netbsd-7]: Makefile.aarch64
src/sys/arch/arm/conf [netbsd-7]: Makefile.arm
Log Message:
Pull up following revision(s) (requested by martin in ticket #1058):
sys/arch/arm/conf/Makefile.arm: revision 1.43
sys/arch/aarch64/conf/Makefile.aarch64: revision 1.2
share/mk/bsd.sys.mk: revision 1.243, 1.244
Use wildcards for stripping/preserving the mapping symbols on ARM and
AArch64. LLVM creates unique symbols in each file of the form $a.n etc.
--
Fix typo in OBJCOPYLIBFLAGS_EXTRA for aarch64eb.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.242.2.1 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/arm/conf/Makefile.arm
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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.242 src/share/mk/bsd.sys.mk:1.242.2.1
--- src/share/mk/bsd.sys.mk:1.242 Sun Aug 10 17:44:26 2014
+++ src/share/mk/bsd.sys.mk Tue Jan 5 22:22:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.242 2014/08/10 17:44:26 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.242.2.1 2016/01/05 22:22:36 snj Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -261,10 +261,10 @@ YFLAGS+= ${YPREFIX:D-p${YPREFIX}} ${YHEA
# Objcopy
.if ${MACHINE_ARCH} == aarch64eb
# AARCH64 big endian needs to preserve $x/$d symbols for the linker.
-OBJCOPYLIBFALGS_EXTRA=-K '\$x' -K '\$d'
+OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][dx]' -K '[$$][dx]\.*'
.elif !empty(MACHINE_ARCH:M*arm*eb)
# ARM big endian needs to preserve $a/$d/$t symbols for the linker.
-OBJCOPYLIBFLAGS_EXTRA=-K '\$a' -K '\$d' -K '\$t'
+OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][adt]' -K '[$$][adt]\.*'
.endif
OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
Index: src/sys/arch/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.1 src/sys/arch/aarch64/conf/Makefile.aarch64:1.1.2.1
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.1 Sun Aug 10 05:47:37 2014
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Tue Jan 5 22:22:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.1 2014/08/10 05:47:37 matt Exp $
+# $NetBSD: Makefile.aarch64,v 1.1.2.1 2016/01/05 22:22:36 snj Exp $
# Makefile for NetBSD
#
@@ -69,8 +69,8 @@ LINKFLAGS_NORMAL+= -T ${LDSCRIPT}
# with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
.if !defined(DEBUG) || empty(DEBUG:M-g*)
SYSTEM_LD_TAIL?= ${SYSTEM_LD_TAIL_DBSYM}; \
- ${OBJCOPY} --strip-symbol='$$k' \
- --strip-symbol='$$d' $@ ;\
+ ${OBJCOPY} -w --strip-symbol='[$$][dx]' \
+ --strip-symbol='[$$][dx]\.*' $@ ;\
${SIZE} $@; chmod 755 $@
.else
STRIPFLAGS=-g --strip-symbol='$$x' --strip-symbol='$$d'
Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.42 src/sys/arch/arm/conf/Makefile.arm:1.42.4.1
--- src/sys/arch/arm/conf/Makefile.arm:1.42 Sun Mar 2 13:21:59 2014
+++ src/sys/arch/arm/conf/Makefile.arm Tue Jan 5 22:22:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.42 2014/03/02 13:21:59 joerg Exp $
+# $NetBSD: Makefile.arm,v 1.42.4.1 2016/01/05 22:22:36 snj Exp $
# Makefile for NetBSD
#
@@ -83,9 +83,8 @@ LINKFLAGS_NORMAL= -X
# with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
.if !defined(DEBUG) || empty(DEBUG:M-g*)
SYSTEM_LD_TAIL?= ${SYSTEM_LD_TAIL_DBSYM} ; \
- ${OBJCOPY} --strip-symbol='$$a' \
- --strip-symbol='$$t' \
- --strip-symbol='$$d' $@ ;\
+ ${OBJCOPY} --wildcard --strip-symbol='[$$][atd]' \
+ --strip-symbol='[$$][atd]\.*' $@; \
${SIZE} $@; chmod 755 $@
.else
STRIPFLAGS=-g --strip-symbol='$$a' --strip-symbol='$$t' --strip-symbol='$$d'
