Module Name: src
Committed By: tsutsui
Date: Sat Jul 2 17:37:29 UTC 2011
Modified Files:
src/distrib/cats/instkernel: Makefile
src/distrib/shark/instkernel/instkernel: Makefile
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/cats/instkernel/Makefile
cvs rdiff -u -r1.21 -r1.22 src/distrib/shark/instkernel/instkernel/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cats/conf/Makefile.cats.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.19 src/distrib/cats/instkernel/Makefile:1.20
--- src/distrib/cats/instkernel/Makefile:1.19 Mon Oct 4 15:56:53 2010
+++ src/distrib/cats/instkernel/Makefile Sat Jul 2 17:37:28 2011
@@ -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}
Index: src/distrib/shark/instkernel/instkernel/Makefile
diff -u src/distrib/shark/instkernel/instkernel/Makefile:1.21 src/distrib/shark/instkernel/instkernel/Makefile:1.22
--- src/distrib/shark/instkernel/instkernel/Makefile:1.21 Mon Oct 4 13:45:28 2010
+++ src/distrib/shark/instkernel/instkernel/Makefile Sat Jul 2 17:37:28 2011
@@ -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
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.23 src/sys/arch/cats/conf/Makefile.cats.inc:1.24
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.23 Tue Jul 6 05:59:59 2010
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sat Jul 2 17:37:28 2011
@@ -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
