Module Name: src
Committed By: dholland
Date: Fri Nov 25 23:06:58 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
The compat options should all be in one block.
To generate a diff of this commit:
cvs rdiff -u -r1.437 -r1.438 src/sys/arch/amd64/conf/GENERIC
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.437 src/sys/arch/amd64/conf/GENERIC:1.438
--- src/sys/arch/amd64/conf/GENERIC:1.437 Sun Aug 7 10:44:05 2016
+++ src/sys/arch/amd64/conf/GENERIC Fri Nov 25 23:06:58 2016
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ makeoptions DEBUG="-g" # compile full sy
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 COMPAT_LINUX32 # req. COMPAT_LI
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
