summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc64/conf/GENERIC3
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc643
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index de6f23b4149..4c95acbd06c 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.23 2001/10/08 14:16:31 jason Exp $
+# $OpenBSD: GENERIC,v 1.24 2001/10/08 22:17:14 art Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -8,7 +8,6 @@ include "../../../conf/GENERIC"
option SUN4U
option _LP64
-option DDB_SAFE_CONSOLE # XXX - remove later
option PCIVERBOSE
maxusers 64
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 655fc89bf6b..3cbe379aa1c 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -17,8 +17,7 @@ S!= cd ../../../..; pwd
SPARC64= $S/arch/sparc64
INCLUDES= -nostdinc -I. -I$S/arch -I$S
-# XXX - remove the __OpenBSD__ later!
-CPPFLAGS= -U__NetBSD__ -D__OpenBSD__ ${INCLUDES} ${IDENT} -D_KERNEL -Dsparc64
+CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL
CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main