summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-11-06 19:37:06 +0000
committermiod <miod@openbsd.org>2013-11-06 19:37:06 +0000
commit26f940c3b677b3a70ddb2be75f65f4519ab7420d (patch)
treef94a301034daa5ca8111e3ac5f6a43d53c649c70
parentforgot armv7/armv7 files... (diff)
downloadwireguard-openbsd-26f940c3b677b3a70ddb2be75f65f4519ab7420d.tar.xz
wireguard-openbsd-26f940c3b677b3a70ddb2be75f65f4519ab7420d.zip
Don't cargo-cult copy the invocation of size(1) on compiled bootblocks,
when 1) they aren't in ELF format, and 2) the result does not EVEN REMOTELY matter on these architectures.
-rw-r--r--sys/arch/mvme68k/stand/bootst/Makefile4
-rw-r--r--sys/arch/mvme88k/stand/bootst/Makefile5
-rw-r--r--sys/arch/mvme88k/stand/netboot/Makefile3
-rw-r--r--sys/arch/mvme88k/stand/tftpboot/Makefile3
4 files changed, 4 insertions, 11 deletions
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 23572ade9ec..d22e4335be7 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,7 +1,6 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $OpenBSD: Makefile,v 1.15 2013/02/02 13:36:06 miod Exp $
+# $OpenBSD: Makefile,v 1.16 2013/11/06 19:37:06 miod Exp $
-SIZE?= size
STRIP?= strip
S= ${.CURDIR}/../../../..
@@ -33,7 +32,6 @@ all: ${ALL}
bootst.bug: ${BUGCRT} ${OBJS} ${LIBS}
${LD} ${LDFLAGS} -o $@ \
${BUGCRT} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
- @${SIZE} bootst.bug
bootst stboot: bootst.bug ${WRTVID}
${STRIP} -I a.out-m68k-netbsd -o bootst.strip bootst.bug
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index add72dfd501..e4475fb9464 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,7 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $OpenBSD: Makefile,v 1.17 2013/01/16 20:45:09 miod Exp $
-
-SIZE?= size
+# $OpenBSD: Makefile,v 1.18 2013/11/06 19:37:06 miod Exp $
S= ${.CURDIR}/../../../..
DEFS= -DSTANDALONE -DCOMPAT_NOLABEL
@@ -33,7 +31,6 @@ all: ${ALL}
bootst.bug: ${STAGE1_CRT} ${OBJS} ${LIBS}
${LD} ${LDFLAGS} -o $@ \
${STAGE1_CRT} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
- @${SIZE} bootst.bug
bootst stboot: bootst.bug ${WRTVID}
${WRTVID} bootst.bug
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 7dcdf357cfd..f7093d132af 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.20 2013/05/12 10:43:45 miod Exp $
+# $OpenBSD: Makefile,v 1.21 2013/11/06 19:37:06 miod Exp $
-SIZE?= size
STRIP?= strip
S= ${.CURDIR}/../../../..
diff --git a/sys/arch/mvme88k/stand/tftpboot/Makefile b/sys/arch/mvme88k/stand/tftpboot/Makefile
index f4b11d2b815..bafeee7ec1c 100644
--- a/sys/arch/mvme88k/stand/tftpboot/Makefile
+++ b/sys/arch/mvme88k/stand/tftpboot/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.8 2013/01/16 20:45:09 miod Exp $
+# $OpenBSD: Makefile,v 1.9 2013/11/06 19:37:06 miod Exp $
-SIZE?= size
STRIP?= strip
S= ${.CURDIR}/../../../..