summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/boot
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 14:46:21 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 14:46:21 +0000
commit9333c875627ad69d46ab3793263036ff3b45cc49 (patch)
tree697841a9433248956f025a7d1b3cd8019dfef64c /sys/arch/i386/stand/boot
parent1caaeac6aae64a980b30cd0f00e3d491be174c97 (diff)
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@
Diffstat (limited to 'sys/arch/i386/stand/boot')
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 277b0eb7e17..cafad2f16c9 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2011/11/06 13:39:43 jsing Exp $
+# $OpenBSD: Makefile,v 1.37 2012/08/21 14:46:18 pascal Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -67,5 +67,7 @@ CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} -I${S}/stand/boot #-DCOMPAT_UFS
CFLAGS+=-m32 $(SACFLAGS) -D__INTERNAL_LIBSA_CREAD
+CFLAGS+=${NOPIE_FLAGS}
AFLAGS+=-m32 # -Wa,-R
# AFLAGS+=-Wa,-a
+AFLAGS+=${NOPIE_FLAGS}