[src/trunk]: src/sys/arch/amd64/conf The compat options should all be in one ...

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

details:   https://anonhg.NetBSD.org/src/rev/41c5eae68e7d
branches:  trunk
changeset: 819297:41c5eae68e7d
user:      dholland <dholland%NetBSD.org@localhost>
date:      Fri Nov 25 23:06:58 2016 +0000

description:
The compat options should all be in one block.

diffstat:

 sys/arch/amd64/conf/GENERIC |  22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diffs (50 lines):

diff -r 0547a985e3b8 -r 41c5eae68e7d sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Nov 25 23:02:44 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Nov 25 23:06:58 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.437 2016/08/07 10:44:05 christos Exp $
+# $NetBSD: GENERIC,v 1.438 2016/11/25 23:06:58 dholland Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.437 $"
+#ident                 "GENERIC-$Revision: 1.438 $"
 
 maxusers       64              # estimated number of users
 
@@ -110,6 +110,14 @@
 options        KDTRACE_HOOKS   # kernel DTrace hooks
 
 # Compatibility options
+#options       EXEC_AOUT       # required by binaries from before 1.5
+#options       COMPAT_NOMID    # NetBSD 0.8, 386BSD, and BSDI
+#options       COMPAT_09       # NetBSD 0.9,
+#options       COMPAT_10       # NetBSD 1.0,
+#options       COMPAT_11       # NetBSD 1.1,
+#options       COMPAT_12       # NetBSD 1.2 (and 386BSD and BSDI),
+#options       COMPAT_13       # NetBSD 1.3 (and 386BSD and BSDI),
+#options       COMPAT_14       # NetBSD 1.4,
 options        COMPAT_15       # NetBSD 1.5,
 options        COMPAT_16       # NetBSD 1.6,
 options        COMPAT_20       # NetBSD 2.0,
@@ -128,16 +136,6 @@
 options        EXEC_ELF32
 options        COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
 
-# The following options are for running i386 binaries for pre-1.6
-#options       EXEC_AOUT
-#options       COMPAT_NOMID    # NetBSD 0.8, 386BSD, and BSDI
-#options       COMPAT_09       # NetBSD 0.9,
-#options       COMPAT_10       # NetBSD 1.0,
-#options       COMPAT_11       # NetBSD 1.1,
-#options       COMPAT_12       # NetBSD 1.2 (and 386BSD and BSDI),
-#options       COMPAT_13       # NetBSD 1.3 (and 386BSD and BSDI),
-#options       COMPAT_14       # NetBSD 1.4,
-
 # Wedge support
 options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
 options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges