Provide COMPAT_SUNOS files via the common m68k configuration files.

6 files changed, 15 insertions, 37 deletions

diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 110a2eb74a7..469ca189e5e 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amiga,v 1.43 2001/08/25 11:37:26 espie Exp $
+#	$OpenBSD: files.amiga,v 1.44 2001/11/21 00:29:56 miod Exp $
 #	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
 
 
@@ -375,12 +375,6 @@ major	{cd = 7}
 major	{ccd = 8}
 major	{rd = 16}
 
-# Compatibility modules
-
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include "../../../compat/sunos/files.sunos"
-file	arch/m68k/m68k/sunos_machdep.c	compat_sunos
-
 # PCIC pcmcia controller
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index 5ea840bbe7e..30ea05d3aec 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hp300,v 1.15 2001/08/26 00:15:33 miod Exp $
+#	$OpenBSD: files.hp300,v 1.16 2001/11/21 00:29:58 miod Exp $
 #	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
@@ -207,9 +207,3 @@ major	{vnd = 6}
 #
 include "compat/hpux/files.hpux"
 file	arch/hp300/hp300/hpux_machdep.c		compat_hpux
-
-#
-# SunOS binary compatibility
-#
-include "compat/sunos/files.sunos"
-file	arch/m68k/m68k/sunos_machdep.c		compat_sunos
diff --git a/sys/arch/m68k/conf/files.m68k b/sys/arch/m68k/conf/files.m68k
index 85fc24a52bb..725a96c919d 100644
--- a/sys/arch/m68k/conf/files.m68k
+++ b/sys/arch/m68k/conf/files.m68k
@@ -1,4 +1,4 @@
-#       $OpenBSD: files.m68k,v 1.9 2001/08/25 11:37:26 espie Exp $
+#       $OpenBSD: files.m68k,v 1.10 2001/11/21 00:29:58 miod Exp $
 #       $NetBSD: files.m68k,v 1.18 1997/06/06 23:15:28 veego Exp $
 #
 file	arch/m68k/m68k/db_disasm.c		ddb
@@ -18,5 +18,13 @@ file	arch/m68k/m68k/bcopy.s
 file	arch/m68k/m68k/copypage.s
 file	arch/m68k/m68k/regdump.c
 
+#
+# Older m68k4k executables binary compatibility
+#
+include "compat/m68k4k/files.m68k4k"
 
-include "../../../compat/m68k4k/files.m68k4k"
+#
+# SunOS binary compatibility
+#
+include "compat/sunos/files.sunos"
+file	arch/m68k/m68k/sunos_machdep.c		compat_sunos
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index ee31c21bf92..db2e269423a 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mac68k,v 1.23 2001/05/11 07:13:15 deraadt Exp $
+#	$OpenBSD: files.mac68k,v 1.24 2001/11/21 00:29:58 miod Exp $
 #	$NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
 
 # mac68k-specific configuration info
@@ -132,9 +132,3 @@ major	{st = 5}
 major	{cd = 6}
 major	{vnd = 8}
 major	{rd = 13}
-
-# Compatibility modules
-
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include "compat/sunos/files.sunos"
-file	arch/m68k/m68k/sunos_machdep.c	compat_sunos
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 9e32eae6dae..ca8f8b03eba 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.18 2001/05/11 07:13:15 deraadt Exp $
+#	$OpenBSD: files.mvme68k,v 1.19 2001/11/21 00:29:58 miod Exp $
 
 # config file for mvme68k
 
@@ -131,10 +131,6 @@ file arch/m68k/m68k/db_memrw.c			ddb
 include	"compat/hpux/files.hpux"
 file	arch/mvme68k/mvme68k/hpux_machdep.c	compat_hpux
 
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include	"compat/sunos/files.sunos"
-file	arch/m68k/m68k/sunos_machdep.c		compat_sunos
-
 device wl: tty
 attach wl at vmes
 file arch/mvme68k/dev/wl.c			wl needs-count
diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3
index 0feef1d2547..61b9f2b9726 100644
--- a/sys/arch/sun3/conf/files.sun3
+++ b/sys/arch/sun3/conf/files.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sun3,v 1.18 2001/05/30 20:37:51 miod Exp $
+#	$OpenBSD: files.sun3,v 1.19 2001/11/21 00:29:58 miod Exp $
 #	$NetBSD: files.sun3,v 1.26 1996/10/29 19:58:14 gwr Exp $
 
 #
@@ -152,8 +152,6 @@ device	xy: disk
 attach	xy at xyc
 file	arch/sun3/dev/xy.c		xy needs-flag
 
-
-
 #
 # Console (zs) related stuff
 #
@@ -183,9 +181,3 @@ major	{sd=7}	# SCSI disk
 major	{xd=10}	# Xylogics 7053
 major	{rd=13}	# RAM disk (for mini-kernel)
 major	{cd=18}	# CD-ROM drives
-
-# Compatibility modules
-
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include "../../../compat/sunos/files.sunos"
-file	arch/m68k/m68k/sunos_machdep.c	compat_sunos