From e8b1116bf92fe7a815aa14a808dd507566b2001b Mon Sep 17 00:00:00 2001
From: semarie <semarie@openbsd.org>
Date: Sat, 13 Feb 2021 18:39:40 +0000
Subject: [PATCH] distrib: remove STRIPOPTS variable from alpha and sparc64
 Makefile

ok deraadt@ danj@
---
 distrib/alpha/miniroot/Makefile   | 8 +++-----
 distrib/sparc64/miniroot/Makefile | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 67851a7456d..8e07205d47a 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2021/01/05 15:10:40 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.19 2021/02/13 18:39:40 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5760
@@ -11,8 +11,6 @@ RAMDISK=	RAMDISKBIG
 LISTS=		${.CURDIR}/list
 UTILS=		${.CURDIR}/../../miniroot
 
-STRIPOPTS=	-R .eh_frame -R .SUNW_ctf -R .shstrtab
-
 MRDISKTYPE=	rdroot
 MRMAKEFSARGS=	-o disklabel=${MRDISKTYPE},minfree=0,density=8192
 
@@ -65,7 +63,7 @@ ${CDROM}: bsd.gz
 
 bsd.gz: bsd.rd
 	objcopy -Sg -R .comment bsd.rd bsd.strip
-	strip ${STRIPOPTS} bsd.strip
+	strip -R .eh_frame -R .SUNW_ctf -R .shstrtab bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
 bsd.rd: mr.fs bsd
@@ -93,7 +91,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 ${STRIPOPTS} instbin
+	strip -R .eh_frame -R .SUNW_ctf -R .shstrtab instbin
 
 instbin.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index c3d950c71b0..2d8c924bc6e 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2020/05/18 06:20:44 otto Exp $
+#	$OpenBSD: Makefile,v 1.24 2021/02/13 18:39:40 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		6400
@@ -11,8 +11,6 @@ RAMDISK=	RAMDISK
 LISTS=		${.CURDIR}/list
 UTILS=		${.CURDIR}/../../miniroot
 
-STRIPOPTS=	-R .SUNW_ctf
-
 MRDISKTYPE=	rdroot
 MRMAKEFSARGS=	-o disklabel=${MRDISKTYPE},minfree=0,density=4096
 
@@ -62,7 +60,7 @@ ${CDROM}: bsd.rd ${FS}
 
 bsd.gz: bsd.rd
 	objcopy -Sg -R .comment bsd.rd bsd.strip
-	strip ${STRIPOPTS} bsd.strip
+	strip -R .SUNW_ctf bsd.strip
 	gzip -9cn bsd.strip > bsd.gz
 
 bsd.rd: mr.fs bsd
-- 
2.20.1