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@

4 files changed, 13 insertions, 4 deletions

diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc
index 063028b4dcd..feb3616b0a9 100644
--- a/sys/arch/sgi/stand/Makefile.inc
+++ b/sys/arch/sgi/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2011/03/18 06:21:40 matthew Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2012/08/21 14:46:19 pascal Exp $
 #	$NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $
 
 .ifndef __INCLUDED_STAND_MAKEFILE_INC
@@ -19,8 +19,13 @@ SAABI?=		-mips3 -mno-abicalls -G 0 -fno-pic -fno-common
 AS?=		as
 LD?=		ld
 LIBSA_CPPFLAGS?= -DNEEDS_HEAP_H
+.else
+AFLAGS+=	${NOPIE_FLAGS}
+CFLAGS+=	${NOPIE_FLAGS}
 .endif
 
+CFLAGS+=	${NOPIE_FLAGS}
+
 ### Figure out what to use for libsa
 LIBSADIR?=               ${.CURDIR}/../libsa
 
diff --git a/sys/arch/sgi/stand/boot/Makefile b/sys/arch/sgi/stand/boot/Makefile
index 8b7eb7d8384..32be11981f7 100644
--- a/sys/arch/sgi/stand/boot/Makefile
+++ b/sys/arch/sgi/stand/boot/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.13 2012/03/29 20:22:18 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
 
 NOMAN=		noman
+NOPIE=
 
 CFLAGS+=	${SAABI} -mno-abicalls -D_NO_ABICALLS -nostdinc -D__sgi__ \
 		-I${.CURDIR}/../include -I${.CURDIR}/../../../.. \
diff --git a/sys/arch/sgi/stand/libsa/Makefile b/sys/arch/sgi/stand/libsa/Makefile
index ff6cb0acbb4..dc04b0cb3dc 100644
--- a/sys/arch/sgi/stand/libsa/Makefile
+++ b/sys/arch/sgi/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2009/05/14 18:57:43 miod Exp $
+#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $
 
 LIB=	sa
 
@@ -30,6 +30,7 @@ ${OBJS}:	${.CURDIR}/../Makefile.inc
 
 NOPROFILE=
 NOPIC=
+NOPIE=
 
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
 .BEGIN:
diff --git a/sys/arch/sgi/stand/libz/Makefile b/sys/arch/sgi/stand/libz/Makefile
index b80d1b5989d..93de210f64b 100644
--- a/sys/arch/sgi/stand/libz/Makefile
+++ b/sys/arch/sgi/stand/libz/Makefile
@@ -1,8 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 2009/05/14 18:57:43 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/08/21 14:46:19 pascal Exp $
 
 S=${.CURDIR}/../../../..
 ZDST=${.OBJDIR}
 
+NOPIE=
+
 .PATH: ${S}/lib/libz
 
 .include "${S}/lib/libz/Makefile"