aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/conf/NOTES3
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/options.amd641
-rw-r--r--sys/i386/conf/NOTES6
4 files changed, 9 insertions, 3 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 17fa39fc82a6..cbe3efbd00e4 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -632,6 +632,9 @@ options COMPAT_FREEBSD32
# Emulate spx device for client side of SVR3 local X interface
#XXX#options SPX_HACK
+# Enable (32-bit) a.out binary support
+options COMPAT_AOUT
+
# Enable 32-bit runtime support for CloudABI binaries.
options COMPAT_CLOUDABI32
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 1de5fde27f7b..376878aa3ee0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -617,6 +617,8 @@ dev/isci/scil/scif_sas_timer.c optional isci
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/kern_clocksource.c standard
+kern/imgact_aout.c optional compat_aout
+kern/imgact_gzip.c optional gzip
kern/link_elf_obj.c standard
libkern/x86/crc32_sse42.c standard
#
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 6da1dff23b8c..1edb70164a8f 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -14,6 +14,7 @@ PV_STATS opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
# (see src/sys/conf/options), except for broken debugging options.
+COMPAT_AOUT opt_dontuse.h
COMPAT_FREEBSD32 opt_global.h
#IBCS2 opt_dontuse.h
#COMPAT_LINUX opt_dontuse.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c7cc59d7153c..3adeb338da7b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -913,15 +913,15 @@ options NKPT=31
# Emulate spx device for client side of SVR3 local X interface
options SPX_HACK
+# Enable (32-bit) a.out binary support
+options COMPAT_AOUT
+
# Enable 32-bit runtime support for CloudABI binaries.
options COMPAT_CLOUDABI32
# Enable Linux ABI emulation
options COMPAT_LINUX
-# Enable i386 a.out binary support
-options COMPAT_AOUT
-
# Enable the linux-like proc filesystem support (requires COMPAT_LINUX
# and PSEUDOFS)
options LINPROCFS