[src/trunk]: src Use common ${OBJCOPY_ELF2AOUT_FLAGS}.

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

details:   https://anonhg.NetBSD.org/src/rev/0fa3cd94aff1
branches:  trunk
changeset: 767162:0fa3cd94aff1
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jul 10 04:37:56 2011 +0000

description:
Use common ${OBJCOPY_ELF2AOUT_FLAGS}.

diffstat:

 distrib/cats/instkernel/Makefile             |  12 ++----------
 distrib/shark/instkernel/instkernel/Makefile |  12 ++----------
 sys/arch/cats/conf/Makefile.cats.inc         |  17 +++--------------
 sys/arch/shark/conf/Makefile.shark.inc       |  17 +++--------------
 4 files changed, 10 insertions(+), 48 deletions(-)

diffs (115 lines):

diff -r 87a76e77024d -r 0fa3cd94aff1 distrib/cats/instkernel/Makefile
--- a/distrib/cats/instkernel/Makefile  Sun Jul 10 04:36:13 2011 +0000
+++ b/distrib/cats/instkernel/Makefile  Sun Jul 10 04:37:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2011/07/02 17:37:28 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.21 2011/07/10 04:37:56 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,16 +12,8 @@
 
 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 \
-       ${REMOVE_SECTIONS} \
-       ${.TARGET} ${.TARGET}.tmp ;\
+    ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} ${.TARGET} ${.TARGET}.tmp ;\
        mv ${.TARGET}.tmp ${.TARGET}
 
 .include "${DISTRIBDIR}/common/Makefile.mdset"
diff -r 87a76e77024d -r 0fa3cd94aff1 distrib/shark/instkernel/instkernel/Makefile
--- a/distrib/shark/instkernel/instkernel/Makefile      Sun Jul 10 04:36:13 2011 +0000
+++ b/distrib/shark/instkernel/instkernel/Makefile      Sun Jul 10 04:37:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2011/07/02 17:37:28 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.23 2011/07/10 04:37:56 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,16 +11,8 @@
 
 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 \
-           ${REMOVE_SECTIONS} \
-           ${.TARGET:R} ${.TARGET}
+       ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} ${.TARGET:R} ${.TARGET}
 
 release::      check_RELEASEDIR .WAIT netbsd-INSTALL.aout.gz
        ${RELEASE_INSTALL} netbsd-INSTALL.aout.gz \
diff -r 87a76e77024d -r 0fa3cd94aff1 sys/arch/cats/conf/Makefile.cats.inc
--- a/sys/arch/cats/conf/Makefile.cats.inc      Sun Jul 10 04:36:13 2011 +0000
+++ b/sys/arch/cats/conf/Makefile.cats.inc      Sun Jul 10 04:37:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cats.inc,v 1.24 2011/07/02 17:37:28 tsutsui Exp $
+#      $NetBSD: Makefile.cats.inc,v 1.25 2011/07/10 04:37:56 tsutsui Exp $
 
 MACHINE_ARCH=  arm
 CPPFLAGS+=     -D${MACHINE}
@@ -19,18 +19,7 @@
                ${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 \
-               ${REMOVE_SECTIONS} \
-               $@ $@.aout"; \
-       ${OBJCOPY} -O a.out-arm-netbsd \
-               ${REMOVE_SECTIONS} \
-               $@ $@.aout
+       echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
+       ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
 .endif
diff -r 87a76e77024d -r 0fa3cd94aff1 sys/arch/shark/conf/Makefile.shark.inc
--- a/sys/arch/shark/conf/Makefile.shark.inc    Sun Jul 10 04:36:13 2011 +0000
+++ b/sys/arch/shark/conf/Makefile.shark.inc    Sun Jul 10 04:37:56 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.shark.inc,v 1.15 2011/07/02 17:33:10 tsutsui Exp $
+#      $NetBSD: Makefile.shark.inc,v 1.16 2011/07/10 04:37:56 tsutsui Exp $
 
 MACHINE_ARCH=          arm
 CPPFLAGS+=             -D${MACHINE}
@@ -15,19 +15,8 @@
                ${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 \
-               ${REMOVE_SECTIONS} \
-               $@ $@.aout"; \
-       ${OBJCOPY} -O a.out-arm-netbsd \
-               ${REMOVE_SECTIONS} \
-               $@ $@.aout
+       echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
+       ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
 
 KERNIMAGES=    netbsd netbsd.aout