From: semarie <semarie@openbsd.org>
Date: Sat, 13 Feb 2021 18:41:52 +0000 (+0000)
Subject: distrib: merge objcopy -Sg and strip commands
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e962cb65b4b6cf691b48b8204605e7e4e57a0f34;p=openbsd

distrib: merge objcopy -Sg and strip commands

in the command "objcopy -Sg", the -g option (STRIP_DEBUG) overrides
the -S option (STRIP_ALL). so it is the same as "objcopy -g".

"strip" command without option is doing STRIP_ALL.

merge the both commands to "objcopy -S"

ok deraadt@ danj@
---

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 8e07205d47a..b4bd90de0c5 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2021/02/13 18:39:40 semarie Exp $
+#	$OpenBSD: Makefile,v 1.20 2021/02/13 18:41:52 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5760
@@ -62,8 +62,7 @@ ${CDROM}: bsd.gz
 	rm -f vnd
 
 bsd.gz: bsd.rd
-	objcopy -Sg -R .comment bsd.rd bsd.strip
-	strip -R .eh_frame -R .SUNW_ctf -R .shstrtab bsd.strip
+	objcopy -S -R .comment -R .SUNW_ctf -R .eh_frame -R .shstrtab bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
 bsd.rd: mr.fs bsd
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 2d8c924bc6e..4aa85fa391a 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2021/02/13 18:39:40 semarie Exp $
+#	$OpenBSD: Makefile,v 1.25 2021/02/13 18:41:52 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		6400
@@ -59,8 +59,7 @@ ${CDROM}: bsd.rd ${FS}
 	mksuncd f ${CDROM} ${FS}
 
 bsd.gz: bsd.rd
-	objcopy -Sg -R .comment bsd.rd bsd.strip
-	strip -R .SUNW_ctf bsd.strip
+	objcopy -S -R .comment -R .SUNW_ctf bsd.rd bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
 bsd.rd: mr.fs bsd