diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-05-13 22:45:12 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-05-13 22:45:12 +0000 |
| commit | 0813bddc089dc1133696d2a9692366523cfa4015 (patch) | |
| tree | 243d3845592d5261188bcdf116f9979bdc311805 /sys/arch/i386/conf | |
| parent | d4d555e924e183fd9573e15c39d88d4bdd146f4d (diff) | |
Add option NO_PROPOLICE, which explicitely disables the use of the propolice
stack protection when building kernels. Intended to be used on installation
media, with tight space constraints - currently, only added where
SMALL_KERNEL was already defined.
Not thoroughly tested, but requested by deraadt.
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 0321b5a69f5..0c659a5d96a 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.35 2003/05/13 06:12:43 tedu Exp $ +# $OpenBSD: Makefile.i386,v 1.36 2003/05/13 22:45:10 miod Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -44,6 +44,9 @@ CMACHFLAGS= -march=i486 .else CMACHFLAGS= .endif +.if ${IDENT:M-DNO_PROPOLICE} +CMACHFLAGS+= -fno-stack-protector +.endif COPTS?= -O2 CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 18d9a4bd5af..72bb89f34cc 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.116 2002/12/02 09:00:54 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.117 2003/05/13 22:45:10 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -12,6 +12,7 @@ option I686_CPU option GPL_MATH_EMULATE # floating point emulation option SMALL_KERNEL +option NO_PROPOLICE #option DUMMY_NOPS # speed hack; recommended diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index f357e070f6b..f34458d704b 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.57 2003/01/12 18:05:01 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.58 2003/05/13 22:45:10 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -12,6 +12,7 @@ option I686_CPU option GPL_MATH_EMULATE # floating point emulation option SMALL_KERNEL +option NO_PROPOLICE #option DUMMY_NOPS # speed hack; recommended diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index f12fe3b6fdd..c83b0cb5fd7 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.29 2002/09/03 16:43:13 mickey Exp $ +# $OpenBSD: RAMDISKC,v 1.30 2003/05/13 22:45:10 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -12,6 +12,7 @@ option I686_CPU option GPL_MATH_EMULATE # floating point emulation option SMALL_KERNEL +option NO_PROPOLICE #option DUMMY_NOPS # speed hack; recommended |