[src/netbsd-6-0]: src/sys/arch/sparc64/conf Fix fallout from ticket #1500: CO...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a6e1d8cb4fa
branches:  netbsd-6-0
changeset: 319718:1a6e1d8cb4fa
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jun 07 18:06:38 2018 +0000

description:
Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not
disable it here again.

diffstat:

 sys/arch/sparc64/conf/GENERIC32 |  6 +++---
 sys/arch/sparc64/conf/NONPLUS   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 05d96fec8ded -r 1a6e1d8cb4fa sys/arch/sparc64/conf/GENERIC32
--- a/sys/arch/sparc64/conf/GENERIC32   Tue May 22 14:50:06 2018 +0000
+++ b/sys/arch/sparc64/conf/GENERIC32   Thu Jun 07 18:06:38 2018 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $
+# $NetBSD: GENERIC32,v 1.140.108.1 2018/06/07 18:06:38 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.108.1 $"
 
 include        "arch/sparc64/conf/std.sparc64-32"
 
 no options     COMPAT_NETBSD32
-no options     COMPAT_SVR4_32
+#no options    COMPAT_SVR4_32
diff -r 05d96fec8ded -r 1a6e1d8cb4fa sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS     Tue May 22 14:50:06 2018 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS     Thu Jun 07 18:06:38 2018 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $
+#      $NetBSD: NONPLUS,v 1.58.108.1 2018/06/07 18:06:38 martin Exp $
 
 include "arch/sparc64/conf/NONPLUS64"
 include "arch/sparc64/conf/std.sparc64-32"
 
-#ident                 "NONPLUS-$Revision: 1.58 $"
+#ident                 "NONPLUS-$Revision: 1.58.108.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