Cope with pie-by-default, if it ever happens; ok pascal

3 files changed, 10 insertions, 11 deletions

diff --git a/sys/arch/landisk/stand/boot/Makefile b/sys/arch/landisk/stand/boot/Makefile
index 27d16d3c868..76a67930893 100644
--- a/sys/arch/landisk/stand/boot/Makefile
+++ b/sys/arch/landisk/stand/boot/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 16:21:05 deraadt Exp $
 
 MAN=	boot.8
 MLINKS=	boot.8 boot.conf.5
@@ -6,8 +6,7 @@ MLINKS=	boot.8 boot.conf.5
 .if ${MACHINE} == "landisk"
 PROG=	boot
 SRCS=	srt0.S conf.c devs.c getsecs.c scifcons.c delay.c
-LDFLAGS=-nostdlib -Ttext 0x8ff00000 -N -x -Bstatic -e start
-NOPIE=
+LDFLAGS=-nostdlib -Ttext 0x8ff00000 -N -x -Bstatic -e start -nopie
 OBJCOPY?=objcopy
 
 INSTALL_STRIP=
@@ -17,7 +16,8 @@ CPPFLAGS+=-D_STANDALONE
 CPPFLAGS+=-DSH4
 CPPFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/.. -I${S}
 CPPFLAGS+=-DLOADADDRESS=0x8ff00000
-CFLAGS+=-m4-nofpu
+CFLAGS+=-m4-nofpu -fno-pie
+AFLAGS+= -fno-pie
 
 .PATH:  ${S}/stand/boot
 SRCS+=	boot.c cmd.c vars.c bootarg.c
diff --git a/sys/arch/landisk/stand/mbr/Makefile b/sys/arch/landisk/stand/mbr/Makefile
index d3eab826e33..61743b5a165 100644
--- a/sys/arch/landisk/stand/mbr/Makefile
+++ b/sys/arch/landisk/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/09/02 16:21:05 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -8,8 +8,8 @@ MAN=	mbr.8
 PROG=	mbr
 SRCS=	mbr.S
 AFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../.. #-Wa,a
-LDFLAGS+=-N -e start -Ttext 0x8c200200
-NOPIE=
+AFLAGS+=-fno-pie
+LDFLAGS+=-N -e start -Ttext 0x8c200200 -nopie
 OBJCOPY?=objcopy
 
 INSTALL_STRIP=
diff --git a/sys/arch/landisk/stand/xxboot/Makefile b/sys/arch/landisk/stand/xxboot/Makefile
index c0ba0e5e73f..2f38e6826af 100644
--- a/sys/arch/landisk/stand/xxboot/Makefile
+++ b/sys/arch/landisk/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.6 2012/09/02 16:21:05 deraadt Exp $
 
 MAN=	xxboot.8
 
@@ -7,8 +7,7 @@ PROG=	xxboot
 LINKS=	${BINDIR}/xxboot ${BINDIR}/sdboot 
 LINKS+=	${BINDIR}/xxboot ${BINDIR}/wdboot 
 SRCS=	pbr.S xxboot.S boot1.c
-LDFLAGS=-nostdlib -Ttext 0x8c201000 -N -x -Bstatic -e start
-NOPIE=
+LDFLAGS=-nostdlib -Ttext 0x8c201000 -N -x -Bstatic -e start -nopie
 
 INSTALL_STRIP=
 
@@ -18,7 +17,7 @@ XXBOOT_MAXSIZE?= (( ${XXBOOT_SECTORS} * 512 ))
 CPPFLAGS+=-D_STANDALONE
 CPPFLAGS+=-nostdinc -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../../..
 CPPFLAGS+=-DLOADADDRESS=0x8ff00000 -DXXBOOT_SECTORS=${XXBOOT_SECTORS}
-CFLAGS+=-m4-nofpu
+CFLAGS+=-m4-nofpu -fno-pie
 
 OBJCOPY?=objcopy