summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Marie <semarie@cvs.openbsd.org>2021-02-13 18:41:53 +0000
committerSebastien Marie <semarie@cvs.openbsd.org>2021-02-13 18:41:53 +0000
commit638f47e6aa03f0febc5ea87da96d5215e9ff5572 (patch)
treefe1559b8382ea415271d0b91d2d976daf76ef3a2
parent67c1785793947a6bc379181f4d506e8ef0cbaaf1 (diff)
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@
-rw-r--r--distrib/alpha/miniroot/Makefile5
-rw-r--r--distrib/sparc64/miniroot/Makefile5
2 files changed, 4 insertions, 6 deletions
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