Add NOPIE= bits for sys/arch/*/stand to ensure that bootblocks will always be

built with -fno-pie.  This gets the hairiest part of PIE out of the way ...

ok deraadt@

11 files changed, 22 insertions, 11 deletions

diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index 379d95b01ba..982201bd85a 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.16 2006/01/10 07:36:31 miod Exp $
+#	$OpenBSD: Makefile,v 1.17 2012/08/21 14:46:19 pascal Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS= 
@@ -7,6 +7,7 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${STAGE2_RELOC}
+NOPIE=
 CLEANFILES+=bootsd
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 3167ba77f01..906d1d50478 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.12 2006/01/10 07:36:32 miod Exp $
+#	$OpenBSD: Makefile,v 1.13 2012/08/21 14:46:19 pascal Exp $
 
 SIZE?=	size
 
@@ -8,6 +8,7 @@ DEFS=
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
+NOPIE=
 CLEANFILES+=stboot bootst bootst.bug
 
 .include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc"
diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile
index 59d34eba02a..367fe3aa7ce 100644
--- a/sys/arch/mvme68k/stand/bootxx/Makefile
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile
@@ -1,11 +1,12 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.8 2006/01/10 07:36:32 miod Exp $
+#	$OpenBSD: Makefile,v 1.9 2012/08/21 14:46:19 pascal Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS= 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
+NOPIE=
 CLEANFILES+=bootxx
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile b/sys/arch/mvme68k/stand/bugcrt/Makefile
index fc2c517ead0..ca3b4a16be4 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.8 2007/10/30 06:03:14 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2012/08/21 14:46:19 pascal Exp $
 #
 # DO NOT OPTMIZE bugcrt (i.e. no "-O2")
 #
 S=${.CURDIR}/../../../..
 CFLAGS=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -I${S}/lib/libsa \
 	-fomit-frame-pointer
+NOPIE=
 
 OBJS=bugcrt.o
 
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile b/sys/arch/mvme68k/stand/libbug/Makefile
index e3c23d04011..7a7bfcf411a 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile
+++ b/sys/arch/mvme68k/stand/libbug/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 1996/05/16 02:25:39 chuck Exp $
+#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $
 
 LIB=bug
 
 NOPIC=
 NOPROFILE=
+NOPIE=
 
 S=${.CURDIR}/../../../..
 DIR_SA=$S/lib/libsa
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index 65a5190e4a4..97edc04ff9e 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2008/03/11 20:07:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.22 2012/08/21 14:46:19 pascal Exp $
 
 LIB=sa
 
@@ -6,6 +6,7 @@ CLEANFILES+=SRT0.o
 
 NOPIC=nopic
 NOPROFILE=noprofile
+NOPIE=
 
 # Logically src/sys
 S=${.CURDIR}/../../../..
diff --git a/sys/arch/mvme68k/stand/libz/Makefile b/sys/arch/mvme68k/stand/libz/Makefile
index 1e60765d790..58559723b2a 100644
--- a/sys/arch/mvme68k/stand/libz/Makefile
+++ b/sys/arch/mvme68k/stand/libz/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.1 1997/04/22 16:13:42 gvf Exp $
+#	$OpenBSD: Makefile,v 1.2 2012/08/21 14:46:19 pascal Exp $
 
 S=${.CURDIR}/../../../..
 ZDST=${.OBJDIR}
+NOPIE=
 
 .PATH: ${S}/lib/libz
 
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index 473badbaf03..deac2566471 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2009/02/17 18:42:06 miod Exp $
+#	$OpenBSD: Makefile,v 1.16 2012/08/21 14:46:19 pascal Exp $
 
 SIZE?=	size
 
@@ -20,6 +20,7 @@ SRCS+=	if_ie.c if_le.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS+= -nostdlib -s -N -T ${STAGE2_RELOC}
+NOPIE=
 
 all:	netboot.bin
 
diff --git a/sys/arch/mvme68k/stand/prtvid/Makefile b/sys/arch/mvme68k/stand/prtvid/Makefile
index 67ceebda479..73edc4e6922 100644
--- a/sys/arch/mvme68k/stand/prtvid/Makefile
+++ b/sys/arch/mvme68k/stand/prtvid/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 1996/04/28 10:49:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/08/21 14:46:19 pascal Exp $
 
 PROG=	prtvid
 NOMAN=
+NOPIE=
 
 install:
 
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index e606ec8161e..181391c954d 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2005/08/03 00:16:02 millert Exp $
+#	$OpenBSD: Makefile,v 1.10 2012/08/21 14:46:19 pascal Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -15,6 +15,7 @@ LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS= -N -s -static 
 CLEANFILES+=XBUG.o XSRT0.o oc_cksum.o sboot.tmp rboot.tmp srec sboot rboot
 MDEC_DIR?=/usr/mdec
+NOPIE=
 
 all:	sboot rboot
 
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile b/sys/arch/mvme68k/stand/wrtvid/Makefile
index 2cbd2a08407..f5146f834cb 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 1996/04/28 10:49:47 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/08/21 14:46:19 pascal Exp $
 
 PROG=	wrtvid
 NOMAN=
+NOPIE=
 
 install: