5 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc
index fbaf048b60a..1a6f77e9434 100644
--- a/sys/arch/macppc/stand/Makefile.inc
+++ b/sys/arch/macppc/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2010/05/14 19:50:00 drahn Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2012/09/02 23:07:24 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1996/09/30 16:34:59 ws Exp $
 
 .if !defined(__stand_makefile_inc)
@@ -23,7 +23,8 @@ INCLUDES+=	-I$(S)/lib/libsa
 DEFS+=		-DSTANDALONE
 CFLAGS+=	$(INCLUDES) $(DEFS) $(EXTRACFLAGS)
 CFLAGS+=	-fno-stack-protector
-CFLAGS+=	-fno-builtin
+CFLAGS+=	-fno-builtin -fno-pie
+AFLAGS+=	-fno-pie
 LDFLAGS?=	-X -N -Ttext $(RELOC) -e $(ENTRY)
 
 cleandir:
diff --git a/sys/arch/macppc/stand/boot.mac/Makefile b/sys/arch/macppc/stand/boot.mac/Makefile
index 87067f83b2b..9fdf32c928b 100644
--- a/sys/arch/macppc/stand/boot.mac/Makefile
+++ b/sys/arch/macppc/stand/boot.mac/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.7 2012/09/02 23:07:26 deraadt Exp $
 #       $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
 
 S=      ${.CURDIR}/../../../..
@@ -15,8 +15,8 @@ INSTALL_STRIP=
 BINDIR=         /usr/mdec
 OBJCOPY?=	objcopy
 OBJCOPY_ARGS=	-O aixcoff-rs6000 -R .comment -R .note
-LDFLAGS=	-X -Ttext ${RELOC} -e $(ENTRY) -T ${.CURDIR}/elf32_powerpc_merge.x -Bstatic
-NOPIE=
+LDFLAGS=	-nopie -X -Ttext ${RELOC} -e $(ENTRY)
+LDFLAGS+=	-T ${.CURDIR}/elf32_powerpc_merge.x -Bstatic
 
 .PATH:          ${S}/stand/boot
 .PATH:          ${S}/lib/libsa
@@ -28,6 +28,7 @@ SRCS+=		moddi3.c
 CPPFLAGS+=	-I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CPPFLAGS+=	-DRELOC=0x${RELOC} -DCONSPEED=57600
 CPPFLAGS+=	-DXCOFF_GLUE		# for booting PCI Powermacs
+CFLAGS+=	-fno-pie
 
 LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep
 CLEANFILES=	fixcoff
diff --git a/sys/arch/macppc/stand/mbr/Makefile b/sys/arch/macppc/stand/mbr/Makefile
index 8fbe60b288c..508917c726a 100644
--- a/sys/arch/macppc/stand/mbr/Makefile
+++ b/sys/arch/macppc/stand/mbr/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.2 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/09/02 23:07:26 deraadt Exp $
 
 CLEANFILES= mbr msdos1mb.gz
-NOPIE=
 
 all: mbr msdos1mb.gz
 
diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile
index 5aed69e93e0..073c4e02224 100644
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.8 2012/09/02 23:07:26 deraadt Exp $
 #	$NetBSD: Makefile,v 1.2 1997/04/17 07:46:24 thorpej Exp $
 
 S=	${.CURDIR}/../../../..
@@ -10,8 +10,8 @@ SRCS+=		boot.c conf.c cmd.c vars.c ctime.c strtol.c
 .PATH:		${S}/arch/macppc/stand
 SRCS+=		ofwmagic.S
 #CFLAGS+=	-DDEBUG -DNETIF_DEBUG
+CFLAGS+=	-fno-pie
 NOMAN=
-NOPIE=
 STRIPFLAG=
 BINMODE=	444
 OBJCOPY?=	objcopy
@@ -38,7 +38,7 @@ CPPFLAGS+=	-DRELOC=0x${RELOC} -DCONSPEED=57600
 LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ}
-	${LD} -N -X -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
+	${LD} -nopie -N -X -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
 	    ${OBJS} ${LIBS}
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/macppc/stand/tbxidata/Makefile b/sys/arch/macppc/stand/tbxidata/Makefile
index b87e3ffc007..09abb0d919e 100644
--- a/sys/arch/macppc/stand/tbxidata/Makefile
+++ b/sys/arch/macppc/stand/tbxidata/Makefile
@@ -1,9 +1,8 @@
-#       $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:19 pascal Exp $
+#       $OpenBSD: Makefile,v 1.3 2012/09/02 23:07:26 deraadt Exp $
 
 NOMACHINE=
 FILES=	bsd.tbxi 
 NOOBJ=	noobj
-NOPIE=
 
 install:
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \