Thu Jun 7 18:06:38 2018 UTC ()
Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not
disable it here again.


(martin)
diff -r1.140 -r1.140.108.1 src/sys/arch/sparc64/conf/GENERIC32
diff -r1.58 -r1.58.108.1 src/sys/arch/sparc64/conf/NONPLUS
cvs diff -r1.140 -r1.140.108.1 src/sys/arch/sparc64/conf/GENERIC32 (expand / switch to unified diff)

--- src/sys/arch/sparc64/conf/GENERIC32 2006/06/30 10:27:48 1.140
+++ src/sys/arch/sparc64/conf/GENERIC32 2018/06/07 18:06:38 1.140.108.1
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $ 1# $NetBSD: GENERIC32,v 1.140.108.1 2018/06/07 18:06:38 martin Exp $
2# 2#
3# GENERIC machine description file for 32-bit kernel 3# GENERIC machine description file for 32-bit kernel
4# 4#
5 5
6include "arch/sparc64/conf/GENERIC" 6include "arch/sparc64/conf/GENERIC"
7 7
8#ident "GENERIC32-$Revision: 1.140 $" 8#ident "GENERIC32-$Revision: 1.140.108.1 $"
9 9
10include "arch/sparc64/conf/std.sparc64-32" 10include "arch/sparc64/conf/std.sparc64-32"
11 11
12no options COMPAT_NETBSD32 12no options COMPAT_NETBSD32
13no options COMPAT_SVR4_32 13#no options COMPAT_SVR4_32
cvs diff -r1.58 -r1.58.108.1 src/sys/arch/sparc64/conf/NONPLUS (expand / switch to unified diff)

--- src/sys/arch/sparc64/conf/NONPLUS 2006/06/30 10:27:48 1.58
+++ src/sys/arch/sparc64/conf/NONPLUS 2018/06/07 18:06:38 1.58.108.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $ 1# $NetBSD: NONPLUS,v 1.58.108.1 2018/06/07 18:06:38 martin Exp $
2 2
3include "arch/sparc64/conf/NONPLUS64" 3include "arch/sparc64/conf/NONPLUS64"
4include "arch/sparc64/conf/std.sparc64-32" 4include "arch/sparc64/conf/std.sparc64-32"
5 5
6#ident "NONPLUS-$Revision: 1.58 $" 6#ident "NONPLUS-$Revision: 1.58.108.1 $"
7 7
8no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility 8no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
9no options COMPAT_SVR4_32 # 32-bit SVR4 binaries 9#no options COMPAT_SVR4_32 # 32-bit SVR4 binaries