summaryrefslogtreecommitdiff
path: root/distrib/alpha
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2011-07-08 21:39:33 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2011-07-08 21:39:33 +0000
commit9bd8584be003206951fc40592b806b6e8403eb6f (patch)
treefeb5841cf8a27b312fd8eaf8b67676c88e4b03d0 /distrib/alpha
parent20f2a7c4359811d4c20ec3078b7360cc5a706289 (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/alpha')
-rw-r--r--distrib/alpha/bsd.rd/Makefile6
-rw-r--r--distrib/alpha/common/Makefile.inc6
2 files changed, 8 insertions, 4 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 50c0af31935..45a2b4a4817 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/04/18 16:52:09 thib Exp $
+# $OpenBSD: Makefile,v 1.19 2011/07/08 21:39:32 drahn Exp $
TOP= ${.CURDIR}/..
@@ -58,7 +58,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/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index f8c81a62bca..45450cb93a9 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2011/04/18 16:52:09 thib Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2011/07/08 21:39:32 drahn Exp $
TOP= ${.CURDIR}/..
@@ -82,7 +82,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}