summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-04-18 01:15:47 +0000
committerimp <imp@FreeBSD.org>2010-04-18 01:15:47 +0000
commite1584c02c561794e4b05d622193226b6370df2dc (patch)
tree3beab91b9f932cea314cceb6df9116818ebb7e0f /sys/conf
parent9b85332a7712aa8858207f79bf399b2695fb2f72 (diff)
downloadFreeBSD-src-e1584c02c561794e4b05d622193226b6370df2dc.zip
FreeBSD-src-e1584c02c561794e4b05d622193226b6370df2dc.tar.gz
Remap COMPAT_IA32 to COMPAT_FREEBSD32 to ease the transition of this
option and not break 8.0 config files later in the 8.x branch. # Yes, this is a direct commit, since this is not relevant to head.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/options.amd641
-rw-r--r--sys/conf/options.ia641
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 20a49a1..4f501f6 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -11,6 +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 = COMPAT_FREEBSD32
COMPAT_FREEBSD32 opt_compat.h
#IBCS2 opt_dontuse.h
#COMPAT_LINUX opt_dontuse.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index 603c5ed..cc70feb 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -9,6 +9,7 @@ LOG2_PAGE_SIZE opt_global.h
UWX_TRACE_ENABLE opt_global.h
+COMPAT_IA32 = COMPAT_FREEBSD32
COMPAT_FREEBSD32 opt_compat.h
EXCEPTION_TRACING opt_xtrace.h
OpenPOWER on IntegriCloud