summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/stand/boot/Makefile11
-rw-r--r--sys/arch/alpha/stand/bootxx/Makefile14
-rw-r--r--sys/arch/alpha/stand/netboot/Makefile9
3 files changed, 19 insertions, 15 deletions
diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile
index 19f79e56cb1..f729ed58481 100644
--- a/sys/arch/alpha/stand/boot/Makefile
+++ b/sys/arch/alpha/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/12/14 13:48:25 art Exp $
+# $OpenBSD: Makefile,v 1.12 2001/01/16 15:36:36 art Exp $
# $NetBSD: Makefile,v 1.17 1997/04/17 07:27:46 thorpej Exp $
S= ${.CURDIR}/../../../..
@@ -28,9 +28,10 @@ ${PROG}.nosym: ${PROG}.sym
cp ${PROG}.sym ${PROG}.nosym
strip ${PROG}.nosym
-${PROG}: ${PROG}.nosym ${HEADERSIZE_PROG}
- dd if=${PROG}.nosym of=${PROG} \
- bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1
+${PROG}: ${PROG}.nosym #${HEADERSIZE_PROG}
+ objcopy --output-target=binary ${PROG}.nosym ${PROG}
+# dd if=${PROG}.nosym of=${PROG} \
+# bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1
# no lint here (yet?)
lint:
@@ -62,4 +63,4 @@ ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${COMPILE.c} vers.c
${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
- size ${PROG}.sym
+ size ${PROG}.sym \ No newline at end of file
diff --git a/sys/arch/alpha/stand/bootxx/Makefile b/sys/arch/alpha/stand/bootxx/Makefile
index 6bf6490547e..3c2e6391928 100644
--- a/sys/arch/alpha/stand/bootxx/Makefile
+++ b/sys/arch/alpha/stand/bootxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/01/15 12:08:22 art Exp $
+# $OpenBSD: Makefile,v 1.7 2001/01/16 15:36:36 art Exp $
# $NetBSD: Makefile,v 1.12 1997/04/17 07:27:49 thorpej Exp $
S= ${.CURDIR}/../../../..
@@ -15,7 +15,7 @@ BINMODE= 444
BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS}
HEADERSIZE_PROG = headersize
-CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${HEADERSIZE_PROG}
+CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${PROG}.trunc ${HEADERSIZE_PROG}
DEFNS= -DPRIMARY_BOOTBLOCK
DEFNS+= -DALPHA_BOOT_ECOFF -DALPHA_BOOT_ELF
@@ -28,10 +28,12 @@ ${PROG}.nosym: ${PROG}.sym
cp ${PROG}.sym ${PROG}.nosym
strip ${PROG}.nosym
-${PROG}: ${PROG}.nosym ${HEADERSIZE_PROG}
- dd if=${PROG}.nosym of=${PROG} \
- ibs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1 \
- obs=`expr 15 \* 512` conv=osync
+${PROG}: ${PROG}.nosym #${HEADERSIZE_PROG}
+ objcopy --output-target=binary ${PROG}.nosym ${PROG}.trunc
+ dd if=${PROG}.trunc of=${PROG} obs=`expr 15 \* 512` conv=osync
+# dd if=${PROG}.nosym of=${PROG} \
+# ibs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1 \
+# obs=`expr 15 \* 512` conv=osync
# no lint here (yet?)
lint:
diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile
index 1b6b4453893..b953b86fcd3 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/12/14 13:48:26 art Exp $
+# $OpenBSD: Makefile,v 1.5 2001/01/16 15:36:36 art Exp $
# $NetBSD: Makefile,v 1.11 1997/04/17 07:27:50 thorpej Exp $
S= ${.CURDIR}/../../../..
@@ -30,9 +30,10 @@ ${PROG}.nosym: ${PROG}.sym
cp ${PROG}.sym ${PROG}.nosym
strip ${PROG}.nosym
-${PROG}: ${PROG}.nosym ${HEADERSIZE_PROG}
- dd if=${PROG}.nosym of=${PROG} \
- bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1
+${PROG}: ${PROG}.nosym #${HEADERSIZE_PROG}
+ objcopy --output-target=binary ${PROG}.nosym ${PROG}
+# dd if=${PROG}.nosym of=${PROG} \
+# bs=`./${HEADERSIZE_PROG} ${BOOT_RELOC} ${PROG}.nosym` skip=1
# no lint here (yet?)
lint: