strip .SUNW_ctf in the remaining strip invocations

broke amd64/ramdisk_cd as it no longer fit; spotted by jsg@
ok deraadt@ mpi@

6 files changed, 20 insertions, 21 deletions

diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index ad8b1f4a606..7cf65e8aa59 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2017/06/13 16:28:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.19 2017/08/13 15:41:30 jasper Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -60,7 +60,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}/boot
 	strip ${MOUNT_POINT}/boot
-	strip -R .comment ${MOUNT_POINT}/boot
+	strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
 	    ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot
@@ -117,7 +117,7 @@ clean cleandir:
 bsd.gz: bsd.rd
 	cp ${BSDRD} bsd.strip
 	strip bsd.strip
-	strip -R .comment bsd.strip
+	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
 
 bsd.rd: ${BSDRD}
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
index c51ae0b0517..a2e02e30819 100644
--- a/distrib/amd64/ramdiskA/Makefile.inc
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2017/07/25 13:32:14 robert Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2017/08/13 15:41:30 jasper Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -42,7 +42,7 @@ ${FS}:	bsd.gz
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
-	strip -R .comment ${.OBJDIR}/boot
+	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
 	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
@@ -65,7 +65,7 @@ MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
 bsd.gz: bsd.rd
 	cp bsd.rd bsd.strip
 	strip bsd.strip
-	strip -R .comment bsd.strip
+	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
 
 bsd.rd:	mr.fs bsd rdsetroot
@@ -110,7 +110,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf
 
 instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
-	strip -R .comment instbin
+	strip -R .comment -R .SUNW_ctf instbin
 
 instbin.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=instbin ${LISTS} > instbin.conf
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index 9ecce864e28..aa359a76bbe 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2017/07/25 13:32:14 robert Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2017/08/13 15:41:30 jasper Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -45,7 +45,7 @@ ${FS}:	bsd.gz
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
-	strip -R .comment ${.OBJDIR}/boot
+	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
 	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
@@ -68,7 +68,7 @@ MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
 bsd.gz: bsd.rd
 	cp bsd.rd bsd.strip
 	strip bsd.strip
-	strip -R .comment bsd.strip
+	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
 
 bsd.rd:	mr.fs bsd rdsetroot
@@ -116,7 +116,7 @@ instbin.mk instbin.cache instbin.c: instbin.conf
 
 instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
-	strip -R .comment instbin
+	strip -R .comment -R .SUNW_ctf instbin
 
 instbin.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=instbin ${LISTS} > instbin.conf
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 77686d17c87..8823497eb10 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.43 2017/07/25 13:32:14 robert Exp $
+#	$OpenBSD: Makefile.inc,v 1.44 2017/08/13 15:41:30 jasper Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -37,7 +37,7 @@ ${FS}:	bsd.gz
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${.OBJDIR}/boot
 	strip ${.OBJDIR}/boot
-	strip -R .comment ${.OBJDIR}/boot
+	strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot
 	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
 	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
@@ -62,7 +62,7 @@ COPTS= -Oz -mtune=i486
 bsd.gz: bsd.rd
 	cp bsd.rd bsd.strip
 	strip bsd.strip
-	strip -R .comment bsd.strip
+	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
 
 bsd.rd:	${IMAGE} bsd rdsetroot
@@ -110,7 +110,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all
-	strip -R .comment ${CBIN}
+	strip -R .comment -R .SUNW_ctf ${CBIN}
 
 ${CRUNCHCONF}: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CRUNCHCONF}
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index dd502999869..4c3fbcee484 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2017/06/13 16:28:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2017/08/13 15:41:30 jasper Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -44,8 +44,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	newfs -m 0 -o space -i 524288 -c ${FSSIZE} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}/boot
-	strip ${MOUNT_POINT}/boot
-	strip -R .comment ${MOUNT_POINT}/boot
+	strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot
 	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
 	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
 	    ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot
@@ -102,7 +101,7 @@ clean cleandir:
 bsd.gz: bsd.rd
 	cp ${BSDRD} bsd.strip
 	strip bsd.strip
-	strip -R .comment bsd.strip
+	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
 
 bsd.rd: ${BSDRD}
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index bf1cd59e994..e982f38e7b4 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2016/12/30 22:34:20 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.34 2017/08/13 15:41:30 jasper Exp $
 
 REV=	${OSrev}
 
@@ -34,7 +34,7 @@ cd: ${BSD_RD}
 	-rm -rf ${.OBJDIR}/cd-dir/
 	-@mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/macppc/
 	cp bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
-	strip ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
+	strip -R .SUNW_ctf ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
 	gzip -9n ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
 	mv ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd.gz ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
 	# On HFS, doing the following means COPIES of the files.. therefore