Module Name: src
Committed By: martin
Date: Tue May 22 14:49:02 UTC 2018
Modified Files:
src/sys/arch/amiga/conf [netbsd-6-0]: DRACO GENERIC GENERIC.in
src/sys/arch/hp300/conf [netbsd-6-0]: GENERIC
src/sys/arch/i386/conf [netbsd-6-0]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/sparc/conf [netbsd-6-0]: BILL-THE-CAT GENERIC KRUPS
MRCOFFEE TADPOLE3GX
src/sys/arch/sparc64/conf [netbsd-6-0]: GENERIC NONPLUS64
src/sys/kern [netbsd-6-0]: kern_exec.c
Log Message:
Apply patch requested by maxv in ticket #1500:
* disable compat_svr4 and compat_svr4_32 everywhere
* disable compat_ibcs2 everywhere but on Vax
* remove the svr4/svr4_32/ibcs2/freebsd entries from the autoload list
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.6.1 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.284 -r1.284.6.1 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.96 -r1.96.6.1 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.169 -r1.169.6.1 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.1066.2.7.4.1 -r1.1066.2.7.4.2 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.60.2.5 -r1.60.2.5.4.1 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.41.2.2 -r1.41.2.2.4.1 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/sparc/conf/BILL-THE-CAT
cvs rdiff -u -r1.230 -r1.230.6.1 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.56.4.1 -r1.56.4.1.4.1 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.54.4.1 -r1.54.4.1.4.1 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.148.2.2 -r1.148.2.2.4.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/sparc64/conf/NONPLUS64
cvs rdiff -u -r1.339.2.5.4.4 -r1.339.2.5.4.5 src/sys/kern/kern_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.154 src/sys/arch/amiga/conf/DRACO:1.154.6.1
--- src/sys/arch/amiga/conf/DRACO:1.154 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/DRACO Tue May 22 14:49:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.154 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: DRACO,v 1.154.6.1 2018/05/22 14:49:01 martin Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.154 $"
+#ident "GENERIC-$Revision: 1.154.6.1 $"
maxusers 8
@@ -143,7 +143,7 @@ options COMPAT_30 # NetBSD 3.0 compatib
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_50 # NetBSD 5.0 compatibility.
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
+#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.284 src/sys/arch/amiga/conf/GENERIC:1.284.6.1
--- src/sys/arch/amiga/conf/GENERIC:1.284 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/GENERIC Tue May 22 14:49:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.284 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.284.6.1 2018/05/22 14:49:01 martin Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.284 $"
+#ident "GENERIC-$Revision: 1.284.6.1 $"
maxusers 8
@@ -155,7 +155,7 @@ options COMPAT_30 # NetBSD 3.0 compatib
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_50 # NetBSD 5.0 compatibility.
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
+#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.96 src/sys/arch/amiga/conf/GENERIC.in:1.96.6.1
--- src/sys/arch/amiga/conf/GENERIC.in:1.96 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Tue May 22 14:49:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.96 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.96.6.1 2018/05/22 14:49:01 martin Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.96 $"
+#ident "GENERIC-$Revision: 1.96.6.1 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -196,7 +196,7 @@ options COMPAT_30 # NetBSD 3.0 compatib
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_50 # NetBSD 5.0 compatibility.
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
+#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
')m4_dnl
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.169 src/sys/arch/hp300/conf/GENERIC:1.169.6.1
--- src/sys/arch/hp300/conf/GENERIC:1.169 Sun Dec 18 05:49:27 2011
+++ src/sys/arch/hp300/conf/GENERIC Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.169 2011/12/18 05:49:27 dholland Exp $
+# $NetBSD: GENERIC,v 1.169.6.1 2018/05/22 14:49:02 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.169 $"
+#ident "GENERIC-$Revision: 1.169.6.1 $"
maxusers 32 # estimated number of users
@@ -95,7 +95,7 @@ options COMPAT_AOUT_M68K # NetBSD/m68k
options COMPAT_M68K4K # NetBSD/m68k4k binary compatibility
options COMPAT_SUNOS # SunOS4 m68k binary compatibility
options COMPAT_LINUX # Linux/m68k binary compatibility
-options COMPAT_SVR4 # SVR4 binary compatibility
+#options COMPAT_SVR4 # SVR4 binary compatibility
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Filesystems
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1066.2.7.4.1 src/sys/arch/i386/conf/GENERIC:1.1066.2.7.4.2
--- src/sys/arch/i386/conf/GENERIC:1.1066.2.7.4.1 Sat Aug 26 16:26:06 2017
+++ src/sys/arch/i386/conf/GENERIC Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066.2.7.4.1 2017/08/26 16:26:06 snj Exp $
+# $NetBSD: GENERIC,v 1.1066.2.7.4.2 2018/05/22 14:49:02 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1066.2.7.4.1 $"
+#ident "GENERIC-$Revision: 1.1066.2.7.4.2 $"
maxusers 64 # estimated number of users
@@ -142,8 +142,8 @@ options COMPAT_43 # 4.3BSD, 386BSD, and
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-options COMPAT_SVR4 # binary compatibility with SVR4
-options COMPAT_IBCS2 # binary compatibility with SCO and ISC
+#options COMPAT_SVR4 # binary compatibility with SVR4
+#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
#options COMPAT_NDIS # NDIS network driver
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5.4.1
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5 Wed Aug 15 15:33:00 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.5 2012/08/15 15:33:00 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.5.4.1 2018/05/22 14:49:02 martin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -95,8 +95,8 @@ options COMPAT_386BSD_MBRPART # recogni
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-options COMPAT_SVR4 # binary compatibility with SVR4
-options COMPAT_IBCS2 # binary compatibility with SCO and ISC
+#options COMPAT_SVR4 # binary compatibility with SVR4
+#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.2 src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.2.4.1
--- src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.2 Wed Aug 15 15:33:00 2012
+++ src/sys/arch/i386/conf/XEN3_DOMU Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.41.2.2 2012/08/15 15:33:00 sborrill Exp $
+# $NetBSD: XEN3_DOMU,v 1.41.2.2.4.1 2018/05/22 14:49:02 martin Exp $
include "arch/xen/conf/std.xen"
@@ -81,8 +81,8 @@ options COMPAT_386BSD_MBRPART # recogni
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-options COMPAT_SVR4 # binary compatibility with SVR4
-options COMPAT_IBCS2 # binary compatibility with SCO and ISC
+#options COMPAT_SVR4 # binary compatibility with SVR4
+#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/sparc/conf/BILL-THE-CAT
diff -u src/sys/arch/sparc/conf/BILL-THE-CAT:1.51 src/sys/arch/sparc/conf/BILL-THE-CAT:1.51.8.1
--- src/sys/arch/sparc/conf/BILL-THE-CAT:1.51 Tue Nov 22 21:25:36 2011
+++ src/sys/arch/sparc/conf/BILL-THE-CAT Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: BILL-THE-CAT,v 1.51 2011/11/22 21:25:36 tls Exp $
+# $NetBSD: BILL-THE-CAT,v 1.51.8.1 2018/05/22 14:49:02 martin Exp $
# From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
include "arch/sparc/conf/std.sparc"
@@ -134,7 +134,7 @@ options COMPAT_20 # NetBSD 2.0 binary c
options COMPAT_30 # NetBSD 3.0 binary compatibility
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.230 src/sys/arch/sparc/conf/GENERIC:1.230.6.1
--- src/sys/arch/sparc/conf/GENERIC:1.230 Wed Jan 11 17:18:51 2012
+++ src/sys/arch/sparc/conf/GENERIC Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.230 2012/01/11 17:18:51 macallan Exp $
+# $NetBSD: GENERIC,v 1.230.6.1 2018/05/22 14:49:02 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.230 $"
+#ident "GENERIC-$Revision: 1.230.6.1 $"
maxusers 32
@@ -183,7 +183,7 @@ options COMPAT_30 # NetBSD 3.0 binary c
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_50 # NetBSD 5.0 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.56.4.1 src/sys/arch/sparc/conf/KRUPS:1.56.4.1.4.1
--- src/sys/arch/sparc/conf/KRUPS:1.56.4.1 Tue Jun 12 17:47:58 2012
+++ src/sys/arch/sparc/conf/KRUPS Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.56.4.1 2012/06/12 17:47:58 riz Exp $
+# $NetBSD: KRUPS,v 1.56.4.1.4.1 2018/05/22 14:49:02 martin Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.56.4.1 $"
+#ident "KRUPS-$Revision: 1.56.4.1.4.1 $"
maxusers 32
@@ -184,7 +184,7 @@ options COMPAT_20 # NetBSD 2.0 binary c
options COMPAT_30 # NetBSD 3.0 binary compatibility
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.34 src/sys/arch/sparc/conf/MRCOFFEE:1.34.8.1
--- src/sys/arch/sparc/conf/MRCOFFEE:1.34 Tue Nov 22 21:25:37 2011
+++ src/sys/arch/sparc/conf/MRCOFFEE Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.34 2011/11/22 21:25:37 tls Exp $
+# $NetBSD: MRCOFFEE,v 1.34.8.1 2018/05/22 14:49:02 martin Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.34 $"
+#ident "MRCOFFEE-$Revision: 1.34.8.1 $"
maxusers 32
@@ -165,7 +165,7 @@ options COMPAT_30 # NetBSD 3.0 binary c
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_50 # NetBSD 5.0 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.54.4.1 src/sys/arch/sparc/conf/TADPOLE3GX:1.54.4.1.4.1
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.54.4.1 Tue Jun 12 17:47:59 2012
+++ src/sys/arch/sparc/conf/TADPOLE3GX Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.54.4.1 2012/06/12 17:47:59 riz Exp $
+# $NetBSD: TADPOLE3GX,v 1.54.4.1.4.1 2018/05/22 14:49:02 martin Exp $
include "arch/sparc/conf/std.sparc"
@@ -146,7 +146,7 @@ options COMPAT_30 # NetBSD 3.0 binary c
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_50 # NetBSD 5.0 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.148.2.2 src/sys/arch/sparc64/conf/GENERIC:1.148.2.2.4.1
--- src/sys/arch/sparc64/conf/GENERIC:1.148.2.2 Wed Aug 15 15:33:00 2012
+++ src/sys/arch/sparc64/conf/GENERIC Tue May 22 14:49:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148.2.2 2012/08/15 15:33:00 sborrill Exp $
+# $NetBSD: GENERIC,v 1.148.2.2.4.1 2018/05/22 14:49:02 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.148.2.2 $"
+#ident "GENERIC-$Revision: 1.148.2.2.4.1 $"
maxusers 64
@@ -152,8 +152,8 @@ options COMPAT_30 # NetBSD 3.0 binary c
options COMPAT_40 # NetBSD 4.0 binary compatibility
options COMPAT_50 # NetBSD 5.0 compatibility.
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
-options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
options EXEC_AOUT # execve(2) support for a.out binaries
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
Index: src/sys/arch/sparc64/conf/NONPLUS64
diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.34 src/sys/arch/sparc64/conf/NONPLUS64:1.34.8.1
--- src/sys/arch/sparc64/conf/NONPLUS64:1.34 Tue Nov 22 21:25:38 2011
+++ src/sys/arch/sparc64/conf/NONPLUS64 Tue May 22 14:49:02 2018
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.34 2011/11/22 21:25:38 tls Exp $
+# $NetBSD: NONPLUS64,v 1.34.8.1 2018/05/22 14:49:02 martin Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.34 $"
+#ident "NONPLUS64-$Revision: 1.34.8.1 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -121,8 +121,8 @@ options COMPAT_20 # NetBSD 2.0 binary c
options COMPAT_30 # NetBSD 3.0 compatibility.
options COMPAT_40 # NetBSD 4.0 compatibility.
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-options COMPAT_SVR4 # SunOS 5.x binary compatibility
-options COMPAT_SVR4_32 # 32-bit SVR4 binaries
+#options COMPAT_SVR4 # SunOS 5.x binary compatibility
+#options COMPAT_SVR4_32 # 32-bit SVR4 binaries
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
options EXEC_ELF32 # Exec module for NetBSD/sparc 1.5 binaries.
#options SYSCALL_DEBUG
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.339.2.5.4.4 src/sys/kern/kern_exec.c:1.339.2.5.4.5
--- src/sys/kern/kern_exec.c:1.339.2.5.4.4 Sun Nov 15 20:38:01 2015
+++ src/sys/kern/kern_exec.c Tue May 22 14:49:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.339.2.5.4.4 2015/11/15 20:38:01 bouyer Exp $ */
+/* $NetBSD: kern_exec.c,v 1.339.2.5.4.5 2018/05/22 14:49:01 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.339.2.5.4.4 2015/11/15 20:38:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.339.2.5.4.5 2018/05/22 14:49:01 martin Exp $");
#include "opt_exec.h"
#include "opt_ktrace.h"
@@ -561,15 +561,11 @@ exec_autoload(void)
"exec_coff",
"exec_ecoff",
"compat_aoutm68k",
- "compat_freebsd",
- "compat_ibcs2",
"compat_linux",
"compat_linux32",
"compat_netbsd32",
"compat_sunos",
"compat_sunos32",
- "compat_svr4",
- "compat_svr4_32",
"compat_ultrix",
NULL
};
