[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/8e8429b5ba6f
branches:  netbsd-7
changeset: 799745:8e8429b5ba6f
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jan 05 22:22:36 2016 +0000

description:
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.

diffstat:

 share/mk/bsd.sys.mk                    |  6 +++---
 sys/arch/aarch64/conf/Makefile.aarch64 |  6 +++---
 sys/arch/arm/conf/Makefile.arm         |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r d6532bcca87d -r 8e8429b5ba6f share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Tue Jan 05 22:18:27 2016 +0000
+++ b/share/mk/bsd.sys.mk       Tue Jan 05 22:22:36 2016 +0000
@@ -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 @@
 # 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}
 
diff -r d6532bcca87d -r 8e8429b5ba6f sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64    Tue Jan 05 22:18:27 2016 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64    Tue Jan 05 22:22:36 2016 +0000
@@ -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 @@
 # 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'
diff -r d6532bcca87d -r 8e8429b5ba6f sys/arch/arm/conf/Makefile.arm
--- a/sys/arch/arm/conf/Makefile.arm    Tue Jan 05 22:18:27 2016 +0000
+++ b/sys/arch/arm/conf/Makefile.arm    Tue Jan 05 22:22:36 2016 +0000
@@ -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 @@
 # 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'