Kill NOPIE and NOPIE_FLAGS in sparc64/stand. Binaries are identical according

to deraadt@, ok kettenis@

5 files changed, 10 insertions, 14 deletions

diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile
index a0471a6f448..e4fe6eaea09 100644
--- a/sys/arch/sparc64/stand/bootblk/Makefile
+++ b/sys/arch/sparc64/stand/bootblk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.9 2012/08/30 19:29:14 pascal Exp $
 #	$NetBSD: Makefile,v 1.1 2000/08/20 14:58:45 mrg Exp $
 
 CURDIR=	${.CURDIR}
@@ -26,7 +26,6 @@ SVR4=-U__SVR4 -U__svr4__ -D__NetBSD__
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_LKM ${SVR4}
-NOPIE=
 
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
 .BEGIN:
diff --git a/sys/arch/sparc64/stand/libsa/Makefile b/sys/arch/sparc64/stand/libsa/Makefile
index 2ad82959460..0af9a19fa76 100644
--- a/sys/arch/sparc64/stand/libsa/Makefile
+++ b/sys/arch/sparc64/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2012/08/21 14:46:20 pascal Exp $
+#	$OpenBSD: Makefile,v 1.8 2012/08/30 19:29:14 pascal Exp $
 
 LIB=	sa
 
@@ -7,6 +7,7 @@ LIB=	sa
 CLEANFILES += machine
 
 CFLAGS= ${CEXTRAFLAGS} ${AFLAGS} -O2 -D__INTERNAL_LIBSA_CREAD -nostdinc \
+	-fno-pie \
 	-I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \
 	-I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \
 	-I${.CURDIR}/../../../../lib/libsa \
@@ -35,7 +36,6 @@ ${OBJS}:	${.CURDIR}/../Makefile.inc
 
 NOPROFILE=
 NOPIC=
-NOPIE=
 
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
 .BEGIN:
diff --git a/sys/arch/sparc64/stand/libz/Makefile b/sys/arch/sparc64/stand/libz/Makefile
index efb19f2559e..60f59c47ac0 100644
--- a/sys/arch/sparc64/stand/libz/Makefile
+++ b/sys/arch/sparc64/stand/libz/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.7 2012/08/21 14:46:20 pascal Exp $
+#	$OpenBSD: Makefile,v 1.8 2012/08/30 19:29:14 pascal Exp $
 
 S=${.CURDIR}/../../../..
 ZDST=${.OBJDIR}
-NOPIE=
 
 .PATH: ${S}/lib/libz
 
 .include "${S}/lib/libz/Makefile"
-CFLAGS+=${CEXTRAFLAGS} ${AFLAGS} -I${S}
+CFLAGS+=${CEXTRAFLAGS} ${AFLAGS} -I${S} -fno-pie
diff --git a/sys/arch/sparc64/stand/ofwboot.net/Makefile b/sys/arch/sparc64/stand/ofwboot.net/Makefile
index 748bae7e080..cd2005dad41 100644
--- a/sys/arch/sparc64/stand/ofwboot.net/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot.net/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2012/08/21 14:46:20 pascal Exp $
+#	$OpenBSD: Makefile,v 1.3 2012/08/30 19:29:14 pascal Exp $
 
 CPPFLAGS+=	-DNETBOOT
 PROG=		ofwboot.net
-NOPIE=
 .include "../ofwboot/Makefile"
 
 .PATH: ${.CURDIR}/../ofwboot
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index 1cd420bc382..39847c92686 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2012/08/21 14:46:20 pascal Exp $
+#	$OpenBSD: Makefile,v 1.18 2012/08/30 19:29:14 pascal Exp $
 #	$NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $
 
 CURDIR=	${.CURDIR}
@@ -22,11 +22,10 @@ SRCS+=		strlcpy.c strcmp.c strlcat.c strlen.c
 
 CWARNFLAGS+=	-Wno-main
 AFLAGS+=	-Wa,-Av9a
-AFLAGS+=	-x assembler-with-cpp -D_LOCORE -D__ELF__
-CFLAGS+=	${COPTS}
+AFLAGS+=	-x assembler-with-cpp -D_LOCORE -D__ELF__ -fno-pie
+CFLAGS+=	${COPTS} -fno-pie
 CPPFLAGS+=	-D_STANDALONE -DSUN4U -nostdinc
 #CPPFLAGS+=	-DNETIF_DEBUG 
-NOPIE=
 
 BINMODE=	444
 
@@ -56,7 +55,7 @@ CPPFLAGS+=	-DSPARC_BOOT_UFS
 .endif
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ}
-	${LD} -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
+	${LD} -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} -nopie \
 	    ${OBJS} -L${LIBSADIR} ${LIBSA} \
 	    -L${LIBZDIR} ${LIBZ}