Kill NOPIE and NOPIE_FLAGS in hppa/stand.

ok deraadt@

5 files changed, 13 insertions, 17 deletions

diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index 720d984154d..04551292705 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.18 2012/08/21 14:46:18 pascal Exp $
+#	$OpenBSD: Makefile.inc,v 1.19 2012/08/31 16:13:20 pascal Exp $
 
 CFLAGS=${DEBUG} -Os -Wall -Werror
-CFLAGS+=${NOPIE_FLAGS}
 CPPFLAGS+=-I${S} -I. -I${.CURDIR}
 SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${STANDIR}/libsa
 SACFLAGS+=-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-1
diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile
index e000e46e31e..5d79cff9f3f 100644
--- a/sys/arch/hppa/stand/boot/Makefile
+++ b/sys/arch/hppa/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2012/08/21 14:46:18 pascal Exp $
+#	$OpenBSD: Makefile,v 1.23 2012/08/31 16:13:20 pascal Exp $
 
 MAN=	boot.8
 MANSUBDIR=hppa
@@ -18,7 +18,7 @@ SRCS+=	milli.S ashrdi3.c memcmp.c memcpy.c memset.c moddi3.c muldi3.c \
 	qdivrem.c strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c
 
 LD?=	ld
-LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
+LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR) -nopie
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map boot.map
 SIZE?=	size
 STRIP?=	strip
@@ -57,5 +57,5 @@ NOPROG=
 
 CPPFLAGS+=${DEBUGFLAGS} -DRELOC=${LOADADDR} -DHEAP_LIMIT=${HEAP_LIMIT}
 CFLAGS+=$(SACFLAGS)
-CFLAGS+=${NOPIE_FLAGS}
-AFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-fno-pie
+AFLAGS+=-fno-pie
diff --git a/sys/arch/hppa/stand/cdboot/Makefile b/sys/arch/hppa/stand/cdboot/Makefile
index 256bfa4f5df..f8f38aa55ad 100644
--- a/sys/arch/hppa/stand/cdboot/Makefile
+++ b/sys/arch/hppa/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:18 pascal Exp $
+#	$OpenBSD: Makefile,v 1.7 2012/08/31 16:13:20 pascal Exp $
 
 NOMAN=	no man
 S	=${.CURDIR}/../../../..
@@ -20,7 +20,7 @@ SRCS+=	pdc.c itecons.c dev_hppa.c dk.c elf32.c elf64.c
 SRCS+=	milli.S strlen.c strlcpy.c
 
 LD?=	ld
-LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
+LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR) -nopie
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map cdboot.map
 SIZE?=	size
 STRIP?=	strip
@@ -60,5 +60,5 @@ NOPROG=
 
 CPPFLAGS+=-DRELOC=${LOADADDR} -DHEAP_LIMIT=${HEAP_LIMIT}
 CFLAGS+=$(SACFLAGS) -I../.. -I${.CURDIR}/../libsa -I${S}/stand/boot
-CFLAGS+=${NOPIE_FLAGS}
-AFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-fno-pie
+AFLAGS+=-fno-pie
diff --git a/sys/arch/hppa/stand/libsa/Makefile b/sys/arch/hppa/stand/libsa/Makefile
index bf3fa2f348f..ec004b01eac 100644
--- a/sys/arch/hppa/stand/libsa/Makefile
+++ b/sys/arch/hppa/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2012/08/21 14:46:18 pascal Exp $
+#	$OpenBSD: Makefile,v 1.16 2012/08/31 16:13:20 pascal Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -10,7 +10,6 @@ DIR_SA=	$S/lib/libsa
 
 NOPROFILE=noprofile
 NOPIC=nopic
-NOPIE=
 
 #AS=cat ;
 #AS+=	-R
@@ -41,4 +40,4 @@ install:
 
 CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} ${DEBUGFLAGS} -DNO_NET
 CPPFLAGS+=-I${S}/stand/boot
-CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD -DCOMPAT_UFS
+CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD -DCOMPAT_UFS -fno-pie
diff --git a/sys/arch/hppa/stand/libz/Makefile b/sys/arch/hppa/stand/libz/Makefile
index e7db96f6a8a..d57a8d57818 100644
--- a/sys/arch/hppa/stand/libz/Makefile
+++ b/sys/arch/hppa/stand/libz/Makefile
@@ -1,12 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 2012/08/21 14:46:18 pascal Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/08/31 16:13:20 pascal Exp $
 
 S=${.CURDIR}/../../../..
 ZDST=${.OBJDIR}
 SADIR=${.CURDIR}/..
 
-NOPIE=
-
 .PATH: ${S}/lib/libz
 
 .include "${S}/lib/libz/Makefile"
-CFLAGS+=${SACFLAGS} -I${S}/lib/libsa
+CFLAGS+=${SACFLAGS} -I${S}/lib/libsa -fno-pie