summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-22 16:58:27 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-22 16:58:27 +0000
commit71223d576a3275c84f8b5dcd682d871a0e3eaa9a (patch)
treedda22435dd8f43b5ebac3b5ce2f8895d793aabe0 /sys/arch/amd64
parent85cdc4047a46471a7b4901e113479d36b1154e01 (diff)
Build the kernel with -fno-pie. Just getting Ms out of my tree; this will be
cleaned up later. ok deraadt@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/Makefile.amd644
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index b0966c68952..f22441a8469 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amd64,v 1.51 2011/11/08 18:41:34 matthieu Exp $
+# $OpenBSD: Makefile.amd64,v 1.52 2012/08/22 16:58:26 pascal Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -31,7 +31,7 @@ CMACHFLAGS= -mcmodel=kernel -mno-red-zone -mno-sse2 -mno-sse -mno-3dnow \
-mno-mmx -msoft-float -fno-omit-frame-pointer
CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \
-fno-builtin-vsnprintf -fno-builtin-log \
- -fno-builtin-log2 -fno-builtin-malloc
+ -fno-builtin-log2 -fno-builtin-malloc ${NOPIE_FLAGS}
.if ${IDENT:M-DNO_PROPOLICE}
CMACHFLAGS+= -fno-stack-protector
.endif