summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-05-13 22:45:12 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-05-13 22:45:12 +0000
commit0813bddc089dc1133696d2a9692366523cfa4015 (patch)
tree243d3845592d5261188bcdf116f9979bdc311805 /sys/arch/sparc
parentd4d555e924e183fd9573e15c39d88d4bdd146f4d (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/sparc')
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc5
-rw-r--r--sys/arch/sparc/conf/RAMDISK3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 2dd476952a5..33328bfaced 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.29 2003/05/13 06:12:44 tedu Exp $
+# $OpenBSD: Makefile.sparc,v 1.30 2003/05/13 22:45:11 miod Exp $
# $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $
# Makefile for OpenBSD
@@ -45,6 +45,9 @@ CMACHFLAGS= -mcpu=supersparc
.else
CMACHFLAGS=
.endif
+.if ${IDENT:M-DNO_PROPOLICE}
+CMACHFLAGS+= -fno-stack-protector
+.endif
CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
# add `-mno-fpu' to work around gcc (last noticed in v2.7.2) bug
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index 6989de60626..3d50b4ceb6d 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.40 2003/05/13 17:24:10 miod Exp $
+# $OpenBSD: RAMDISK,v 1.41 2003/05/13 22:45:11 miod Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -17,6 +17,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