Module Name: src
Committed By: martin
Date: Thu Jun 7 18:01:51 UTC 2018
Modified Files:
src/sys/arch/sparc64/conf [netbsd-6]: GENERIC32 NONPLUS
Log Message:
Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not
disable it here again.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.140.102.1 src/sys/arch/sparc64/conf/GENERIC32
cvs rdiff -u -r1.58 -r1.58.102.1 src/sys/arch/sparc64/conf/NONPLUS
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/sparc64/conf/GENERIC32
diff -u src/sys/arch/sparc64/conf/GENERIC32:1.140 src/sys/arch/sparc64/conf/GENERIC32:1.140.102.1
--- src/sys/arch/sparc64/conf/GENERIC32:1.140 Fri Jun 30 10:27:48 2006
+++ src/sys/arch/sparc64/conf/GENERIC32 Thu Jun 7 18:01:51 2018
@@ -1,13 +1,13 @@
-# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $
+# $NetBSD: GENERIC32,v 1.140.102.1 2018/06/07 18:01:51 martin Exp $
#
# GENERIC machine description file for 32-bit kernel
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC32-$Revision: 1.140 $"
+#ident "GENERIC32-$Revision: 1.140.102.1 $"
include "arch/sparc64/conf/std.sparc64-32"
no options COMPAT_NETBSD32
-no options COMPAT_SVR4_32
+#no options COMPAT_SVR4_32
Index: src/sys/arch/sparc64/conf/NONPLUS
diff -u src/sys/arch/sparc64/conf/NONPLUS:1.58 src/sys/arch/sparc64/conf/NONPLUS:1.58.102.1
--- src/sys/arch/sparc64/conf/NONPLUS:1.58 Fri Jun 30 10:27:48 2006
+++ src/sys/arch/sparc64/conf/NONPLUS Thu Jun 7 18:01:51 2018
@@ -1,9 +1,9 @@
-# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $
+# $NetBSD: NONPLUS,v 1.58.102.1 2018/06/07 18:01:51 martin Exp $
include "arch/sparc64/conf/NONPLUS64"
include "arch/sparc64/conf/std.sparc64-32"
-#ident "NONPLUS-$Revision: 1.58 $"
+#ident "NONPLUS-$Revision: 1.58.102.1 $"
no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
-no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
+#no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
