Use new rdsetroot.

4 files changed, 14 insertions, 32 deletions

diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 317485d68e1..15b60a0ad2c 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.35 2017/09/18 20:13:53 jasper Exp $
+#	$OpenBSD: Makefile,v 1.36 2019/04/05 21:08:01 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -24,9 +24,9 @@ bsd.rd:	bsd.rd_unz
 	strip ${STRIPOPTS} bsd.strip
 	gzip -c ${GZIPFLAGS} bsd.strip > bsd.rd
 
-bsd.rd_unz: bsd ${IMAGE} rdsetroot
+bsd.rd_unz: bsd ${IMAGE}
 	cp bsd bsd.rd_unz
-	${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE}
+	rdsetroot bsd.rd_unz ${IMAGE}
 
 bsd:
 	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/${RAMDISK} && \
@@ -43,11 +43,6 @@ ${IMAGE}: ${CBIN}
 	rm $@.d/${CBIN}
 	makefs ${MAKEFSARGS_RD} $@ $@.d
 
-rdsetroot:	${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
-	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
-	    ${TOP}/../common/elf64.c
-
 .ifdef RELEASEDIR
 install:
 .ifndef NOBSDRD
@@ -69,7 +64,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
 	    lib*.a lib*.olist ${CBIN}.map \
-	    *.o *.lo *.c bsd bsd.rd{,_unz} bsd.gz bsd.strip floppy*.fs rdsetroot
+	    *.o *.lo *.c bsd bsd.rd{,_unz} bsd.gz bsd.strip floppy*.fs
 	/bin/rm -rf ${IMAGE}.d
 
 .include <bsd.obj.mk>
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 8f46729c38b..2daadf3527d 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.17 2017/06/03 22:25:19 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.18 2019/04/05 21:08:01 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -67,9 +67,6 @@ rd_teardown:
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
-rdsetroot:	${TOP}/../../common/elfrdsetroot.c
-	${HOSTCC} -o rdsetroot ${TOP}/../../common/elfrdsetroot.c
-
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-vnconfig -u ${VND}
@@ -103,6 +100,6 @@ do_files:
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
 	    lib*.a lib*.olist ${CBIN}.map \
-	    *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot
+	    *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs
 
 .include <bsd.subdir.mk>
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 7c0f93fec4b..9acd15ce1d6 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2017/09/19 19:23:57 jasper Exp $
+#	$OpenBSD: Makefile,v 1.37 2019/04/05 21:08:01 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -58,9 +58,9 @@ ${FLOPPY}:	bsd.gz ${BOOT} /usr/
 	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYSIZE}
 	rm -f ${REALIMAGE}
 
-${BSD_RD}: ${CBIN} ${IMAGE} bsd elfrdsetroot
+${BSD_RD}: ${CBIN} ${IMAGE} bsd
 	cp bsd ${BSD_RD}
-	${.OBJDIR}/elfrdsetroot ${BSD_RD} < ${IMAGE}
+	rdsetroot ${BSD_RD} ${IMAGE}
 	strip -R .SUNW_ctf ${BSD_RD}
 
 ${IMAGE}: ${CBIN}
@@ -80,11 +80,6 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
 	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
 
-elfrdsetroot:	${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \
-	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
-	    ${TOP}/../common/elf64.c
-
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-vnconfig -u ${VND}
@@ -101,7 +96,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
 	    lib*.a lib*.olist ${CBIN}.map \
-	    *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot
+	    *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY}
 	/bin/rm -rf ${IMAGE}.d
 
 .ifdef RELEASEDIR
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index e66e426ad90..940f5a1801e 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2017/09/19 19:23:57 jasper Exp $
+#	$OpenBSD: Makefile,v 1.31 2019/04/05 21:08:01 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -58,9 +58,9 @@ ${FLOPPY}:	bsd.gz ${BOOT} /usr/
 	dd if=${REALIMAGE} of=${FLOPPY} count=${FLOPPYSIZE}
 	rm -f ${REALIMAGE}
 
-${BSD_RD}: ${CBIN} ${IMAGE} bsd elfrdsetroot
+${BSD_RD}: ${CBIN} ${IMAGE} bsd
 	cp bsd ${BSD_RD}
-	${.OBJDIR}/elfrdsetroot ${BSD_RD} < ${IMAGE}
+	rdsetroot ${BSD_RD} ${IMAGE}
 	strip -R .SUNW_ctf ${BSD_RD}
 
 ${IMAGE}: ${CBIN}
@@ -80,11 +80,6 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Oz ${MAKE}'
 	cp -p ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/obj/bsd bsd
 
-elfrdsetroot:	${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \
-	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
-	    ${TOP}/../common/elf64.c
-
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-vnconfig -u ${VND}
@@ -101,7 +96,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
 	    lib*.a lib*.olist ${CBIN}.map \
-	    *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot
+	    *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY}
 	/bin/rm -rf ${IMAGE}.d
 
 .ifdef RELEASEDIR