Module Name:    src
Committed By:   bouyer
Date:           Thu Aug 31 08:41:33 UTC 2017

Modified Files:
        src/sys/arch/amiga/conf [netbsd-8]: DRACO GENERIC GENERIC.in
        src/sys/arch/i386/conf [netbsd-8]: ALL GENERIC XEN3_DOM0 XEN3_DOMU
        src/sys/arch/sparc/conf [netbsd-8]: GENERIC KRUPS MRCOFFEE TADPOLE3GX
        src/sys/arch/sparc64/conf [netbsd-8]: GENERIC NONPLUS64
        src/sys/kern [netbsd-8]: kern_exec.c

Log Message:
apply paych, requested by maxv in ticket #237:
        sys/arch/amiga/conf/DRACO               patch
        sys/arch/amiga/conf/GENERIC             patch
        sys/arch/amiga/conf/GENERIC.in          patch
        sys/arch/i386/conf/ALL                  patch
        sys/arch/i386/conf/GENERIC              patch
        sys/arch/i386/conf/XEN3_DOM0            patch
        sys/arch/i386/conf/XEN3_DOMU            patch
        sys/arch/sparc/conf/GENERIC             patch
        sys/arch/sparc/conf/KRUPS               patch
        sys/arch/sparc/conf/MRCOFFEE            patch
        sys/arch/sparc/conf/TADPOLE3GX          patch
        sys/arch/sparc64/conf/GENERIC           patch
        sys/arch/sparc64/conf/NONPLUS64         patch
        sys/kern/kern_exec.c                    patch

Disables compat_svr4 and compat_svr4_32 on each architecture,
and removes the associated module autoload entries.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.180.8.1 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.314 -r1.314.8.1 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.132 -r1.132.8.1 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.419 -r1.419.2.1 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1156.2.4 -r1.1156.2.5 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.112.4.3 -r1.112.4.4 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.77.2.2 -r1.77.2.3 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.253 -r1.253.8.1 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.70 -r1.70.8.1 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.198.6.2 -r1.198.6.3 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/sparc64/conf/NONPLUS64
cvs rdiff -u -r1.442 -r1.442.4.1 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.180 src/sys/arch/amiga/conf/DRACO:1.180.8.1
--- src/sys/arch/amiga/conf/DRACO:1.180	Tue Dec 13 20:42:16 2016
+++ src/sys/arch/amiga/conf/DRACO	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.180 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: DRACO,v 1.180.8.1 2017/08/31 08:41:33 bouyer 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.180 $"
+#ident 		"GENERIC-$Revision: 1.180.8.1 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -141,7 +141,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary 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.314 src/sys/arch/amiga/conf/GENERIC:1.314.8.1
--- src/sys/arch/amiga/conf/GENERIC:1.314	Tue Dec 13 20:42:16 2016
+++ src/sys/arch/amiga/conf/GENERIC	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.314 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: GENERIC,v 1.314.8.1 2017/08/31 08:41:33 bouyer 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.314 $"
+#ident 		"GENERIC-$Revision: 1.314.8.1 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -154,7 +154,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary 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.132 src/sys/arch/amiga/conf/GENERIC.in:1.132.8.1
--- src/sys/arch/amiga/conf/GENERIC.in:1.132	Tue Dec 13 20:42:16 2016
+++ src/sys/arch/amiga/conf/GENERIC.in	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.132 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: GENERIC.in,v 1.132.8.1 2017/08/31 08:41:33 bouyer 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.132 $"
+#ident 		"GENERIC-$Revision: 1.132.8.1 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -196,7 +196,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary 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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.419 src/sys/arch/i386/conf/ALL:1.419.2.1
--- src/sys/arch/i386/conf/ALL:1.419	Sat May 27 22:53:29 2017
+++ src/sys/arch/i386/conf/ALL	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.419 2017/05/27 22:53:29 bouyer Exp $
+# $NetBSD: ALL,v 1.419.2.1 2017/08/31 08:41:33 bouyer Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.419 $"
+#ident		"ALL-$Revision: 1.419.2.1 $"
 
 maxusers	64		# estimated number of users
 
@@ -149,7 +149,7 @@ 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_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

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.4 src/sys/arch/i386/conf/GENERIC:1.1156.2.5
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.4	Tue Aug 29 09:42:19 2017
+++ src/sys/arch/i386/conf/GENERIC	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.4 2017/08/29 09:42:19 martin Exp $
+# $NetBSD: GENERIC,v 1.1156.2.5 2017/08/31 08:41:33 bouyer 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.1156.2.4 $"
+#ident		"GENERIC-$Revision: 1.1156.2.5 $"
 
 maxusers	64		# estimated number of users
 
@@ -144,7 +144,7 @@ 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_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

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.3 src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.4
--- src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.3	Tue Aug 29 09:42:19 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.112.4.3 2017/08/29 09:42:19 martin Exp $
+#	$NetBSD: XEN3_DOM0,v 1.112.4.4 2017/08/31 08:41:33 bouyer Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -97,7 +97,7 @@ 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_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

Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.2 src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.3
--- src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.2	Tue Aug 29 09:42:19 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.77.2.2 2017/08/29 09:42:19 martin Exp $
+# $NetBSD: XEN3_DOMU,v 1.77.2.3 2017/08/31 08:41:33 bouyer Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -81,7 +81,7 @@ 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_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

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.253 src/sys/arch/sparc/conf/GENERIC:1.253.8.1
--- src/sys/arch/sparc/conf/GENERIC:1.253	Sat Dec 10 09:44:06 2016
+++ src/sys/arch/sparc/conf/GENERIC	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.253 2016/12/10 09:44:06 mrg Exp $
+# $NetBSD: GENERIC,v 1.253.8.1 2017/08/31 08:41:33 bouyer 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.253 $"
+#ident 		"GENERIC-$Revision: 1.253.8.1 $"
 
 maxusers	32
 
@@ -172,7 +172,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.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.72 src/sys/arch/sparc/conf/KRUPS:1.72.8.1
--- src/sys/arch/sparc/conf/KRUPS:1.72	Tue Dec 13 20:42:20 2016
+++ src/sys/arch/sparc/conf/KRUPS	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.72 2016/12/13 20:42:20 christos Exp $
+# $NetBSD: KRUPS,v 1.72.8.1 2017/08/31 08:41:33 bouyer 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.72 $"
+#ident 		"KRUPS-$Revision: 1.72.8.1 $"
 
 maxusers	32
 
@@ -176,7 +176,7 @@ options 	COMPAT_20	# NetBSD 2.0,
 options 	COMPAT_30	# NetBSD 3.0, and
 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.51 src/sys/arch/sparc/conf/MRCOFFEE:1.51.8.1
--- src/sys/arch/sparc/conf/MRCOFFEE:1.51	Tue Dec 13 20:42:20 2016
+++ src/sys/arch/sparc/conf/MRCOFFEE	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.51 2016/12/13 20:42:20 christos Exp $
+# $NetBSD: MRCOFFEE,v 1.51.8.1 2017/08/31 08:41:33 bouyer 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.51 $"
+#ident 		"MRCOFFEE-$Revision: 1.51.8.1 $"
 
 maxusers	32
 
@@ -160,7 +160,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.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.70 src/sys/arch/sparc/conf/TADPOLE3GX:1.70.8.1
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.70	Tue Dec 13 20:42:20 2016
+++ src/sys/arch/sparc/conf/TADPOLE3GX	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# 	$NetBSD: TADPOLE3GX,v 1.70 2016/12/13 20:42:20 christos Exp $
+# 	$NetBSD: TADPOLE3GX,v 1.70.8.1 2017/08/31 08:41:33 bouyer Exp $
 
 include "arch/sparc/conf/std.sparc"
 
@@ -142,7 +142,7 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.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.198.6.2 src/sys/arch/sparc64/conf/GENERIC:1.198.6.3
--- src/sys/arch/sparc64/conf/GENERIC:1.198.6.2	Tue Aug 29 09:42:19 2017
+++ src/sys/arch/sparc64/conf/GENERIC	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198.6.2 2017/08/29 09:42:19 martin Exp $
+# $NetBSD: GENERIC,v 1.198.6.3 2017/08/31 08:41:33 bouyer 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.198.6.2 $"
+#ident		"GENERIC-$Revision: 1.198.6.3 $"
 
 maxusers	64
 
@@ -149,8 +149,8 @@ options 	COMPAT_50	# NetBSD 5.0,
 options 	COMPAT_60	# NetBSD 6.0, and
 options 	COMPAT_70	# NetBSD 7.0 binary 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.50 src/sys/arch/sparc64/conf/NONPLUS64:1.50.8.1
--- src/sys/arch/sparc64/conf/NONPLUS64:1.50	Tue Dec 13 20:42:20 2016
+++ src/sys/arch/sparc64/conf/NONPLUS64	Thu Aug 31 08:41:33 2017
@@ -1,8 +1,8 @@
-#	$NetBSD: NONPLUS64,v 1.50 2016/12/13 20:42:20 christos Exp $
+#	$NetBSD: NONPLUS64,v 1.50.8.1 2017/08/31 08:41:33 bouyer Exp $
 
 include 	"arch/sparc64/conf/std.sparc64"
 
-#ident		"NONPLUS64-$Revision: 1.50 $"
+#ident		"NONPLUS64-$Revision: 1.50.8.1 $"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
@@ -115,8 +115,8 @@ options 	COMPAT_20	# NetBSD 2.0,
 options 	COMPAT_30	# NetBSD 3.0, and
 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_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.442 src/sys/kern/kern_exec.c:1.442.4.1
--- src/sys/kern/kern_exec.c:1.442	Fri Apr 21 15:10:34 2017
+++ src/sys/kern/kern_exec.c	Thu Aug 31 08:41:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.442 2017/04/21 15:10:34 christos Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.442.4.1 2017/08/31 08:41:33 bouyer 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.442 2017/04/21 15:10:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.442.4.1 2017/08/31 08:41:33 bouyer Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -585,8 +585,6 @@ exec_autoload(void)
 		"compat_netbsd32",
 		"compat_sunos",
 		"compat_sunos32",
-		"compat_svr4",
-		"compat_svr4_32",
 		"compat_ultrix",
 		NULL
 	};

Reply via email to