Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not disable it here again.diff -r1.140 -r1.140.102.1 src/sys/arch/sparc64/conf/GENERIC32
(martin)
--- src/sys/arch/sparc64/conf/GENERIC32 2006/06/30 10:27:48 1.140
+++ src/sys/arch/sparc64/conf/GENERIC32 2018/06/07 18:01:51 1.140.102.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.102.1 2018/06/07 18:01:51 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 | |||
6 | include "arch/sparc64/conf/GENERIC" | 6 | include "arch/sparc64/conf/GENERIC" | |
7 | 7 | |||
8 | #ident "GENERIC32-$Revision: 1.140 $" | 8 | #ident "GENERIC32-$Revision: 1.140.102.1 $" | |
9 | 9 | |||
10 | include "arch/sparc64/conf/std.sparc64-32" | 10 | include "arch/sparc64/conf/std.sparc64-32" | |
11 | 11 | |||
12 | no options COMPAT_NETBSD32 | 12 | no options COMPAT_NETBSD32 | |
13 | no options COMPAT_SVR4_32 | 13 | #no options COMPAT_SVR4_32 |
--- src/sys/arch/sparc64/conf/NONPLUS 2006/06/30 10:27:48 1.58
+++ src/sys/arch/sparc64/conf/NONPLUS 2018/06/07 18:01:51 1.58.102.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.102.1 2018/06/07 18:01:51 martin Exp $ | |
2 | 2 | |||
3 | include "arch/sparc64/conf/NONPLUS64" | 3 | include "arch/sparc64/conf/NONPLUS64" | |
4 | include "arch/sparc64/conf/std.sparc64-32" | 4 | include "arch/sparc64/conf/std.sparc64-32" | |
5 | 5 | |||
6 | #ident "NONPLUS-$Revision: 1.58 $" | 6 | #ident "NONPLUS-$Revision: 1.58.102.1 $" | |
7 | 7 | |||
8 | no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility | 8 | no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility | |
9 | no options COMPAT_SVR4_32 # 32-bit SVR4 binaries | 9 | #no options COMPAT_SVR4_32 # 32-bit SVR4 binaries |