12 files changed, 24 insertions, 12 deletions
diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index 665a880f398..f739a0e7d30 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.14 2008/04/02 21:53:17 miod Exp $
+#	$OpenBSD: Makefile,v 1.15 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+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${STAGE2_RELOC}
+NOPIE=
 CLEANFILES+=bootsd
 
 .include "${S}/arch/mvme88k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index d7463654b2a..b068fd58ad0 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.13 2008/04/02 21:53:17 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
 
 SIZE?=	size
 
@@ -9,6 +9,7 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-s -N -T ${STAGE2_RELOC}
+NOPIE=
 CLEANFILES+=stboot bootst bootst.bug
 
 .include "${S}/arch/mvme88k/stand/wrtvid/Makefile.inc"
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index 7537fd4569c..ceecab48be1 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,11 +1,12 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.13 2008/09/19 20:18:03 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC}
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
+NOPIE=
 CLEANFILES+=bootxx
 
 .include "${S}/arch/mvme88k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme88k/stand/bugcrt/Makefile b/sys/arch/mvme88k/stand/bugcrt/Makefile
index 65216c4afa1..e9e12d2b1ab 100644
--- a/sys/arch/mvme88k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme88k/stand/bugcrt/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2008/04/02 21:53:17 miod Exp $
+#	$OpenBSD: Makefile,v 1.13 2012/08/21 14:46:19 pascal Exp $
 
 S=${.CURDIR}/../../../..
 
@@ -8,6 +8,7 @@ STAGE2_CFLAGS=-DSTAGE2
 NETBOOT_CFLAGS=-DNETBOOT
 SRCS=crt0.S
 OBJS=stage1crt.o stage2crt.o netcrt.o
+NOPIE=
 
 CLEANFILES+=stage1crt.out stage2crt.out netcrt.out ${OBJS}
 
diff --git a/sys/arch/mvme88k/stand/libbug/Makefile b/sys/arch/mvme88k/stand/libbug/Makefile
index 80cdefcb9e6..7d247a24b3e 100644
--- a/sys/arch/mvme88k/stand/libbug/Makefile
+++ b/sys/arch/mvme88k/stand/libbug/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.7 2004/01/26 19:48:33 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 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/mvme88k/stand/libsa/Makefile b/sys/arch/mvme88k/stand/libsa/Makefile
index 6bcefbb145c..efd16b1f73f 100644
--- a/sys/arch/mvme88k/stand/libsa/Makefile
+++ b/sys/arch/mvme88k/stand/libsa/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.13 2008/09/19 20:18:03 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
 
 LIB=sa
 
 NOPIC=nopic
 NOPROFILE=noprofile
+NOPIE=
 
 # Logically src/sys
 S=${.CURDIR}/../../../..
diff --git a/sys/arch/mvme88k/stand/libz/Makefile b/sys/arch/mvme88k/stand/libz/Makefile
index 6e9f98cba6a..58559723b2a 100644
--- a/sys/arch/mvme88k/stand/libz/Makefile
+++ b/sys/arch/mvme88k/stand/libz/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.1 1998/08/22 06:39:14 smurph 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/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 1ea61e75291..32213d415e9 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2008/04/02 21:53:18 miod Exp $
+#	$OpenBSD: Makefile,v 1.16 2012/08/21 14:46:19 pascal Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -22,6 +22,7 @@ SRCS+=	if_ie.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS+= -s -N -T ${STAGE2_RELOC}
+NOPIE=
 
 all:	netboot.bin
 
diff --git a/sys/arch/mvme88k/stand/prtvid/Makefile b/sys/arch/mvme88k/stand/prtvid/Makefile
index 4357d948db1..cc586e89c83 100644
--- a/sys/arch/mvme88k/stand/prtvid/Makefile
+++ b/sys/arch/mvme88k/stand/prtvid/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2006/05/16 22:52:26 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/08/21 14:46:19 pascal Exp $
 PROG=	prtvid
 NOMAN=
+NOPIE=
 
 install:
 
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index 20554c2a17c..76536e1f125 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2005/09/11 13:36:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -11,6 +11,7 @@ SRCS=   sboot.c clock.c etherfun.c if_le.c
 OBJS=	${SRCS:S/.c/.o/g}
 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/mvme88k/stand/tftpboot/Makefile b/sys/arch/mvme88k/stand/tftpboot/Makefile
index 7e245d09012..34ec6344faa 100644
--- a/sys/arch/mvme88k/stand/tftpboot/Makefile
+++ b/sys/arch/mvme88k/stand/tftpboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2008/04/02 21:53:18 miod Exp $
+#	$OpenBSD: Makefile,v 1.5 2012/08/21 14:46:19 pascal Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -20,6 +20,7 @@ SRCS=   boot.c conf.c version.c tftpfs.c netdev.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
 LDFLAGS+= -s -N -T ${STAGE2_RELOC}
+NOPIE=
 
 all:	tftpboot.bin
 
diff --git a/sys/arch/mvme88k/stand/wrtvid/Makefile b/sys/arch/mvme88k/stand/wrtvid/Makefile
index b5ef37617d8..0aaaf4b10c1 100644
--- a/sys/arch/mvme88k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme88k/stand/wrtvid/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2006/05/16 22:52:26 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/08/21 14:46:19 pascal Exp $
 PROG=	wrtvid
 NOMAN=
+NOPIE=
 
 install: