summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2010-03-11 14:49:06 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2010-03-11 14:49:06 +0000
commit142a4d29938aa4f7dde8d4ae621c479cc53fda36 (patch)
treee7bb2301107c48074cb0dbfffd43ee1f7e425d97 /sys/conf
parentd937b522a1d72eb6b270db5bf368d3fd1a79ebcf (diff)
downloadFreeBSD-src-142a4d29938aa4f7dde8d4ae621c479cc53fda36.zip
FreeBSD-src-142a4d29938aa4f7dde8d4ae621c479cc53fda36.tar.gz
Provide groundwork for 32-bit binary compatibility on non-x86 platforms,
for upcoming 64-bit PowerPC and MIPS support. This renames the COMPAT_IA32 option to COMPAT_FREEBSD32, removes some IA32-specific code from MI parts of the kernel and enhances the freebsd32 compatibility code to support big-endian platforms. Reviewed by: kib, jhb
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd6424
-rw-r--r--sys/conf/files.ia6420
-rw-r--r--sys/conf/options.amd642
-rw-r--r--sys/conf/options.ia642
4 files changed, 24 insertions, 24 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 9300f89..905d246 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -227,20 +227,20 @@ kern/link_elf_obj.c standard
#
# IA32 binary support
#
-#amd64/ia32/ia32_exception.S optional compat_ia32
-amd64/ia32/ia32_reg.c 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
-amd64/ia32/ia32_misc.c optional compat_ia32
-compat/freebsd32/freebsd32_ioctl.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
+#amd64/ia32/ia32_exception.S optional compat_freebsd32
+amd64/ia32/ia32_reg.c optional compat_freebsd32
+amd64/ia32/ia32_signal.c optional compat_freebsd32
+amd64/ia32/ia32_sigtramp.S optional compat_freebsd32
+amd64/ia32/ia32_syscall.c optional compat_freebsd32
+amd64/ia32/ia32_misc.c optional compat_freebsd32
+compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32
+compat/freebsd32/freebsd32_misc.c optional compat_freebsd32
+compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32
+compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32
+compat/ia32/ia32_sysvec.c optional compat_freebsd32
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
-kern/imgact_elf32.c optional compat_ia32
+kern/imgact_elf32.c optional compat_freebsd32
#
# Linux/i386 binary support
#
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 86ca963..33d93ac 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -28,11 +28,11 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
-compat/freebsd32/freebsd32_ioctl.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
+compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32
+compat/freebsd32/freebsd32_misc.c optional compat_freebsd32
+compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32
+compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32
+compat/ia32/ia32_sysvec.c optional compat_freebsd32
contrib/ia64/libuwx/src/uwx_bstream.c standard
contrib/ia64/libuwx/src/uwx_context.c standard
contrib/ia64/libuwx/src/uwx_env.c standard
@@ -68,10 +68,10 @@ ia64/acpica/madt.c optional acpi
ia64/disasm/disasm_decode.c standard
ia64/disasm/disasm_extract.c standard
ia64/disasm/disasm_format.c standard
-ia64/ia32/ia32_misc.c optional compat_ia32
-ia64/ia32/ia32_reg.c optional compat_ia32
-ia64/ia32/ia32_signal.c optional compat_ia32
-ia64/ia32/ia32_trap.c optional compat_ia32
+ia64/ia32/ia32_misc.c optional compat_freebsd32
+ia64/ia32/ia32_reg.c optional compat_freebsd32
+ia64/ia32/ia32_signal.c optional compat_freebsd32
+ia64/ia32/ia32_trap.c optional compat_freebsd32
ia64/ia64/autoconf.c standard
ia64/ia64/bus_machdep.c standard
ia64/ia64/busdma_machdep.c standard
@@ -117,7 +117,7 @@ ia64/isa/isa_dma.c optional isa
ia64/pci/pci_cfgreg.c optional pci
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/imgact_elf32.c optional compat_ia32
+kern/imgact_elf32.c optional compat_freebsd32
libkern/bcmp.c standard
libkern/ffsl.c standard
libkern/fls.c standard
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 5617da4..20a49a1 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -11,7 +11,7 @@ MP_WATCHDOG
# 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_IA32 opt_compat.h
+COMPAT_FREEBSD32 opt_compat.h
#IBCS2 opt_dontuse.h
#COMPAT_LINUX opt_dontuse.h
COMPAT_LINUX32 opt_compat.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index 7a292ed..603c5ed 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -9,7 +9,7 @@ LOG2_PAGE_SIZE opt_global.h
UWX_TRACE_ENABLE opt_global.h
-COMPAT_IA32 opt_compat.h
+COMPAT_FREEBSD32 opt_compat.h
EXCEPTION_TRACING opt_xtrace.h
OpenPOWER on IntegriCloud