summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-04-05 19:17:26 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-04-05 19:17:26 +0000
commite33fdae7d8a5cb18db9766f0c68ab329c73a8618 (patch)
tree2449bc96f80a968e35f715292583762609b4da96
parenta85aa144b5f3995e98e81071dd81b293b4c51cbe (diff)
Switch mvme88k to -O2 optimization by default.
(the perl chunk discussed with millert@ and pushed upstream)
-rw-r--r--gnu/usr.bin/perl/hints/openbsd.sh4
-rw-r--r--share/mk/sys.mk6
-rw-r--r--sys/arch/mvme88k/conf/Makefile.mvme88k4
3 files changed, 5 insertions, 9 deletions
diff --git a/gnu/usr.bin/perl/hints/openbsd.sh b/gnu/usr.bin/perl/hints/openbsd.sh
index e025f9b9ab6..4c59b235241 100644
--- a/gnu/usr.bin/perl/hints/openbsd.sh
+++ b/gnu/usr.bin/perl/hints/openbsd.sh
@@ -85,10 +85,10 @@ d_suidsafe=$define
# cc is gcc so we can do better than -O
# Allow a command-line override, such as -Doptimize=-g
case "${ARCH}-${osvers}" in
-hppa-3.3|m88k-2.*)
+hppa-3.3|m88k-2.*|m88k-3.[0-3])
test "$optimize" || optimize='-O0'
;;
-m88k-3.*)
+m88k-3.4)
test "$optimize" || optimize='-O1'
;;
*)
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index c560a3cd606..f493e8f8ad3 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: sys.mk,v 1.36 2004/02/27 18:02:47 deraadt Exp $
+# $OpenBSD: sys.mk,v 1.37 2004/04/05 19:17:25 miod Exp $
# $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
# @(#)sys.mk 5.11 (Berkeley) 3/13/91
@@ -32,11 +32,7 @@ LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
CC?= cc
-.if (${MACHINE_ARCH} == "m88k")
-CFLAGS?= -O1 ${PIPE} ${DEBUG}
-.else
CFLAGS?= -O2 ${PIPE} ${DEBUG}
-.endif
COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 7c7f41b7317..f292482a6b6 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme88k,v 1.31 2003/12/21 16:03:34 espie Exp $
+# $OpenBSD: Makefile.mvme88k,v 1.32 2004/04/05 19:17:25 miod Exp $
#
# Makefile for OpenBSD
#
@@ -42,7 +42,7 @@ CMACHFLAGS= -mno-check-zero-division -mmemcpy \
.if ${IDENT:M-DNO_PROPOLICE}
CMACHFLAGS+= -fno-stack-protector
.endif
-COPTS?= -O1
+COPTS?= -O2
CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE ${CMACHFLAGS}
LINKFLAGS= -Ttext 0x10000 -e start