diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2011-07-08 21:39:33 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2011-07-08 21:39:33 +0000 |
| commit | 9bd8584be003206951fc40592b806b6e8403eb6f (patch) | |
| tree | feb5841cf8a27b312fd8eaf8b67676c88e4b03d0 /distrib/sparc64 | |
| parent | 20f2a7c4359811d4c20ec3078b7360cc5a706289 (diff) | |
Allow the elf rdsetroot operation to function on 32 bit and 64 bit binaries.
Enables developers to build arm ramdisk kernels on amd64 archs
OK deraadt@ 'looked fine' miod@
Diffstat (limited to 'distrib/sparc64')
| -rw-r--r-- | distrib/sparc64/bsd.rd/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 3a584c22fc5..b3f13ad3210 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2011/04/18 16:52:10 thib Exp $ +# $OpenBSD: Makefile,v 1.23 2011/07/08 21:39:32 drahn Exp $ TOP= ${.CURDIR}/.. @@ -62,7 +62,9 @@ ${IMAGE}: do_prep do_mount do_files do_umount mv -f ${REALIMAGE} ${IMAGE} elfrdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot ${TOP}/../common/elfrdsetroot.c + ${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \ + ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \ + ${TOP}/../common/elf64.c do_prep: dd if=/dev/zero of=${REALIMAGE} count=${NBLKS} diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 01c6ff1efea..ecf405fc2a6 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2011/04/18 16:52:10 thib Exp $ +# $OpenBSD: Makefile,v 1.26 2011/07/08 21:39:32 drahn Exp $ TOP= ${.CURDIR}/.. @@ -102,7 +102,9 @@ rd_teardown: -vnconfig -u ${VND} elfrdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} -o 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} diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index ee6b90ea5fc..fe8acfb8669 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2011/04/18 16:52:10 thib Exp $ +# $OpenBSD: Makefile,v 1.19 2011/07/08 21:39:32 drahn Exp $ TOP= ${.CURDIR}/.. @@ -102,7 +102,9 @@ rd_teardown: -vnconfig -u ${VND} elfrdsetroot: ${TOP}/../common/elfrdsetroot.c - ${HOSTCC} -o 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} |