summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k5
-rw-r--r--sys/arch/mvme68k/conf/RAMDISK3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 413fe78a888..abda7ba1f02 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.20 2003/05/13 06:12:43 tedu Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.21 2003/05/13 22:45:10 miod Exp $
# This makefile is constructed from a machine description:
# config machineid
@@ -44,6 +44,9 @@ CMACHFLAGS= -m68020
CMACHFLAGS= -m68060 -Wa,-m68030
.endif
CMACHFLAGS+= -msoft-float
+.if ${IDENT:M-DNO_PROPOLICE}
+CMACHFLAGS+= -fno-stack-protector
+.endif
COPTS?= -O2
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE}
diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK
index 0f6b464ffc8..423bfe49364 100644
--- a/sys/arch/mvme68k/conf/RAMDISK
+++ b/sys/arch/mvme68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.2 2002/04/28 14:47:09 miod Exp $
+# $OpenBSD: RAMDISK,v 1.3 2003/05/13 22:45:10 miod Exp $
machine mvme68k m68k
@@ -23,6 +23,7 @@ maxusers 32
option SCSITERSE
option SMALL_KERNEL
+option NO_PROPOLICE
option TIMEZONE=0 # time zone to adjust RTC time by
option DST=0 # daylight saving time used by RTC
#makeoptions DEBUG="-g" # compile full symbol table