Module Name: src
Committed By: tsutsui
Date: Sun Jul 10 04:37:56 UTC 2011
Modified Files:
src/distrib/cats/instkernel: Makefile
src/distrib/shark/instkernel/instkernel: Makefile
src/sys/arch/cats/conf: Makefile.cats.inc
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Use common ${OBJCOPY_ELF2AOUT_FLAGS}.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/cats/instkernel/Makefile
cvs rdiff -u -r1.22 -r1.23 src/distrib/shark/instkernel/instkernel/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/shark/conf/Makefile.shark.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cats/instkernel/Makefile
diff -u src/distrib/cats/instkernel/Makefile:1.20 src/distrib/cats/instkernel/Makefile:1.21
--- src/distrib/cats/instkernel/Makefile:1.20 Sat Jul 2 17:37:28 2011
+++ src/distrib/cats/instkernel/Makefile Sun Jul 10 04:37:56 2011
@@ -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"
Index: src/distrib/shark/instkernel/instkernel/Makefile
diff -u src/distrib/shark/instkernel/instkernel/Makefile:1.22 src/distrib/shark/instkernel/instkernel/Makefile:1.23
--- src/distrib/shark/instkernel/instkernel/Makefile:1.22 Sat Jul 2 17:37:28 2011
+++ src/distrib/shark/instkernel/instkernel/Makefile Sun Jul 10 04:37:56 2011
@@ -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 \
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.24 src/sys/arch/cats/conf/Makefile.cats.inc:1.25
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.24 Sat Jul 2 17:37:28 2011
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sun Jul 10 04:37:56 2011
@@ -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
Index: src/sys/arch/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.15 src/sys/arch/shark/conf/Makefile.shark.inc:1.16
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.15 Sat Jul 2 17:33:10 2011
+++ src/sys/arch/shark/conf/Makefile.shark.inc Sun Jul 10 04:37:56 2011
@@ -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
