summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/biosboot
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-29 22:23:09 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-29 22:23:09 +0000
commit7493eeb58e78138fb71a17ae74e69b32d25fb7cd (patch)
tree909d4e29a014823555c1f10a8bfaabf532337f3c /sys/arch/i386/stand/biosboot
parentccf68f900df0572e9a61d8a722adf14ffeacb14a (diff)
Kill all NOPIE and NOPIE_FLAGS in i386/stand, replacing them with -fno-pie
and -nopie directly. Binaries from a PIE system are identical to those from a recent snapshot. ok deraadt@
Diffstat (limited to 'sys/arch/i386/stand/biosboot')
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 82a08d90348..ea9d155dab9 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/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/29 22:23:07 pascal Exp $
MAN= biosboot.8
@@ -6,7 +6,7 @@ MAN= biosboot.8
PROG= biosboot
SRCS= biosboot.S
LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic
+LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie
INSTALL_STRIP=
SADIR= ${.CURDIR}/..
@@ -17,9 +17,9 @@ ${PROG}: $(OBJS) $(DPADD)
CPPFLAGS+=-DLOADADDR=$(LOADADDR) -DLINKADDR=$(LINKADDR) -DBOOTMAGIC=$(BOOTMAGIC)
CPPFLAGS+=${DEBUGFLAGS}
-CFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-fno-pie
#AFLAGS+=-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
.else
NOPROG=
.endif