[src/trunk]: src Sync with src/sys/arch/shark/conf/Makefile.shark.inc rev 1.14:

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

details:   https://anonhg.NetBSD.org/src/rev/018c2a803dab
branches:  trunk
changeset: 766818:018c2a803dab
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 02 17:37:28 2011 +0000

description:
Sync with src/sys/arch/shark/conf/Makefile.shark.inc rev 1.14:
> also need to strip out GCC 4.5's new .debug_pubtypes section.
> while here, minor cleanup.

XXX: probably we should have something like ${ARM_AOUT_REMOVE_SECTIONS}
XXX: in bsd.own.mk

diffstat:

 distrib/cats/instkernel/Makefile             |  13 ++++++++-----
 distrib/shark/instkernel/instkernel/Makefile |  14 +++++++++-----
 sys/arch/cats/conf/Makefile.cats.inc         |  18 +++++++++---------
 3 files changed, 26 insertions(+), 19 deletions(-)

diffs (95 lines):

diff -r 9601904a0645 -r 018c2a803dab distrib/cats/instkernel/Makefile
--- a/distrib/cats/instkernel/Makefile  Sat Jul 02 17:33:10 2011 +0000
+++ b/distrib/cats/instkernel/Makefile  Sat Jul 02 17:37:28 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2010/10/04 15:56:53 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.20 2011/07/02 17:37:28 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,12 +12,15 @@
 
 MDSET_NOSTRIP=         # defined
 
+REMOVE_SECTIONS= \
+       -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+       -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+       -R .debug_frame -R .debug_loc -R .debug_pubnames \
+       -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
 MDSET_POST.netbsd-INSTALL.aout= \
     ${OBJCOPY} -O a.out-arm-netbsd \
-       -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
-       -R .debug_frame -R .debug_loc -R .debug_pubnames -R .debug_aranges \
-       -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
-       -R .ARM.attributes \
+       ${REMOVE_SECTIONS} \
        ${.TARGET} ${.TARGET}.tmp ;\
        mv ${.TARGET}.tmp ${.TARGET}
 
diff -r 9601904a0645 -r 018c2a803dab distrib/shark/instkernel/instkernel/Makefile
--- a/distrib/shark/instkernel/instkernel/Makefile      Sat Jul 02 17:33:10 2011 +0000
+++ b/distrib/shark/instkernel/instkernel/Makefile      Sat Jul 02 17:37:28 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2010/10/04 13:45:28 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.22 2011/07/02 17:37:28 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -10,12 +10,16 @@
 MDSET_RELEASEDIR=      binary/kernel
 
 MDSET_SUFFIXES.-=      aout create-aout
+
+REMOVE_SECTIONS= \
+       -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+       -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+       -R .debug_frame -R .debug_loc -R .debug_pubnames \
+       -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
 create-aout= \
        ${OBJCOPY} -O a.out-arm-netbsd \
-           -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
-           -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
-           -R .debug_frame -R .debug_loc -R .debug_pubnames \
-           -R .debug_aranges -R .ARM.attributes \
+           ${REMOVE_SECTIONS} \
            ${.TARGET:R} ${.TARGET}
 
 release::      check_RELEASEDIR .WAIT netbsd-INSTALL.aout.gz
diff -r 9601904a0645 -r 018c2a803dab sys/arch/cats/conf/Makefile.cats.inc
--- a/sys/arch/cats/conf/Makefile.cats.inc      Sat Jul 02 17:33:10 2011 +0000
+++ b/sys/arch/cats/conf/Makefile.cats.inc      Sat Jul 02 17:37:28 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cats.inc,v 1.23 2010/07/06 05:59:59 mrg Exp $
+#      $NetBSD: Makefile.cats.inc,v 1.24 2011/07/02 17:37:28 tsutsui Exp $
 
 MACHINE_ARCH=  arm
 CPPFLAGS+=     -D${MACHINE}
@@ -19,18 +19,18 @@
                ${SYSTEM_OBJ} ; \
          cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
 
+REMOVE_SECTIONS= \
+       -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+       -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+       -R .debug_frame -R .debug_loc -R .debug_pubnames \
+       -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
+
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo \
         "${OBJCOPY} -O a.out-arm-netbsd \
-               -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
-               -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
-               -R .debug_frame -R .debug_loc -R .debug_pubnames \
-               -R .debug_aranges -R .ARM.attributes \
+               ${REMOVE_SECTIONS} \
                $@ $@.aout"; \
        ${OBJCOPY} -O a.out-arm-netbsd \
-               -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
-               -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
-               -R .debug_frame -R .debug_loc -R .debug_pubnames \
-               -R .debug_aranges -R .ARM.attributes \
+               ${REMOVE_SECTIONS} \
                $@ $@.aout
 .endif