diff options
| -rw-r--r-- | sys/amd64/amd64/exception.S | 4 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 46379b19ca18..c5aec6f20ff8 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -31,7 +31,7 @@ */ #include "opt_atpic.h" -#include "opt_ia32.h" +#include "opt_compat.h" #include <machine/asmacros.h> #include <machine/psl.h> @@ -307,7 +307,7 @@ ENTRY(fork_trampoline) * included. */ -#ifdef IA32 +#ifdef COMPAT_IA32 .data .p2align 4 .text diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index aea50d5a80f9..fdeb6d575e4e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -44,7 +44,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options IA32 # Compatible with i386 binaries +options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ba14f6e791b5..f4e72d643855 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -155,15 +155,15 @@ pci/agp_intel.c optional agp # # IA32 binary support # -#amd64/ia32/ia32_exception.S optional ia32 -amd64/ia32/ia32_signal.c optional ia32 -amd64/ia32/ia32_sigtramp.S optional ia32 -amd64/ia32/ia32_syscall.c optional ia32 -compat/freebsd32/freebsd32_misc.c optional ia32 -compat/freebsd32/freebsd32_syscalls.c optional ia32 -compat/freebsd32/freebsd32_sysent.c optional ia32 -compat/ia32/ia32_sysvec.c optional ia32 -kern/imgact_elf32.c optional ia32 +#amd64/ia32/ia32_exception.S optional compat_ia32 +amd64/ia32/ia32_signal.c optional compat_ia32 +amd64/ia32/ia32_sigtramp.S optional compat_ia32 +amd64/ia32/ia32_syscall.c optional compat_ia32 +compat/freebsd32/freebsd32_misc.c optional compat_ia32 +compat/freebsd32/freebsd32_syscalls.c optional compat_ia32 +compat/freebsd32/freebsd32_sysent.c optional compat_ia32 +compat/ia32/ia32_sysvec.c optional compat_ia32 +kern/imgact_elf32.c optional compat_ia32 # # Linux/i386 binary support # |