remove support for compat_sunos (and m68k4k). ok deraadt guenther

6 files changed, 6 insertions, 17 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index ede231f7010..101281389fc 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.95 2010/06/07 19:54:32 miod Exp $
+#	$OpenBSD: GENERIC,v 1.96 2010/07/02 19:57:14 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -25,8 +25,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBDEV=0xc01	# kgdb device number (dev_t)
 #option		KGDBRATE=38400	# baud rate
 
-# Options for SPARCstation hardware
-option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 option		PROCFS		# /proc
 
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index cac3a844612..708c32f09cd 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.68 2010/06/07 20:46:21 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.69 2010/07/02 19:57:15 tedu Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -38,8 +38,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBDEV=0xc01	# kgdb device number (dev_t)
 #option		KGDBRATE=38400	# baud rate
 
-# Options for SPARCstation hardware
-#option		COMPAT_SUNOS	# compatibility with SunOS binaries
 #option		COMPAT_SVR4	# compatibility with SVR4 binaries
 
 option		WSEMUL_SUN	# provide sun terminal emulation; required
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index 38d94aa474d..9dad08c15dc 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4,v 1.37 2010/06/07 19:54:32 miod Exp $
+#	$OpenBSD: SUN4,v 1.38 2010/07/02 19:57:15 tedu Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -11,7 +11,6 @@ option		SUN4		# sun4/100, sun4/200, sun4/300
 #option		MMU_3L		# 3-level MMU on sun4/400
 
 # Options for SPARCstation hardware
-option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 option		PROCFS		# /proc
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 52526975cfe..de472ba8d54 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.60 2009/06/24 11:38:40 deraadt Exp $
+#	$OpenBSD: SUN4C,v 1.61 2010/07/02 19:57:15 tedu Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -14,7 +14,6 @@ option		SUN4C		# sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc.
 #option		KGDBRATE=38400	# baud rate
 
 # Options for SPARCstation hardware
-option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 option		PROCFS		# /proc
 
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 5e3de103eee..aab337b883e 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.76 2009/07/13 19:53:58 kettenis Exp $
+#	$OpenBSD: SUN4M,v 1.77 2010/07/02 19:57:15 tedu Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -16,7 +16,6 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 #option		KGDBRATE=38400	# baud rate
 
 # Options for SPARCstation hardware
-option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
 option		PROCFS		# /proc
 
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 272f90a4968..ccf59e46d6f 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.85 2009/08/29 21:30:48 kettenis Exp $
+#	$OpenBSD: files.sparc,v 1.86 2010/07/02 19:57:15 tedu Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -313,10 +313,6 @@ file	arch/sparc/sparc/db_disasm.c	ddb
 # SVR4 Binary Compatibility (COMPAT_SVR4)
 include	"../../../compat/svr4/files.svr4"
 file	arch/sparc/sparc/svr4_machdep.c	compat_svr4
-file	arch/sparc/sparc/sunos_machdep.c compat_sunos
-
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include	"../../../compat/sunos/files.sunos"
 
 # Magma Serial/Parallel boards
 device	magma {}