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/sparc64/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/sparc64/conf')
| -rw-r--r-- | sys/arch/sparc64/conf/Makefile.sparc64 | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU1 | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU5 | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 5a2f723a14e..2b0fa99ec51 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -19,6 +19,9 @@ CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main CMACHFLAGS= -Wa,-Av9a, -mno-fpu +.if ${IDENT:M-DNO_PROPOLICE} +CMACHFLAGS+= -fno-stack-protector +.endif CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE -Wa,-Av9a diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index e0658951d90..3eeaa290fcb 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.21 2003/02/12 20:54:45 jason Exp $ +# $OpenBSD: RAMDISK,v 1.22 2003/05/13 22:45:11 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -18,6 +18,7 @@ option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC option SMALL_KERNEL +option NO_PROPOLICE option DIAGNOSTIC # internal consistency checks option FFS # UFS option NFSCLIENT # Network File System client diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index 028b9711020..c57d0a9fced 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.3 2001/10/10 04:24:12 deraadt Exp $ +# $OpenBSD: RAMDISKU1,v 1.4 2003/05/13 22:45:11 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -18,6 +18,7 @@ option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC option SMALL_KERNEL +option NO_PROPOLICE #option DIAGNOSTIC # internal consistency checks option FFS # UFS #option NFSCLIENT # Network File System client diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 1410d27a397..425fcf0f5f5 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.3 2001/10/15 18:44:56 jason Exp $ +# $OpenBSD: RAMDISKU5,v 1.4 2003/05/13 22:45:11 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -18,6 +18,7 @@ option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC option SMALL_KERNEL +option NO_PROPOLICE #option DIAGNOSTIC # internal consistency checks option FFS # UFS #option NFSCLIENT # Network File System client |