From 9bf47018d71d54d2f61226dd6fa75a3d54c92632 Mon Sep 17 00:00:00 2001 From: bde Date: Sun, 9 Jan 2000 10:58:39 +0000 Subject: Put COMPAT_SVR4 in opt_dontuse.h for the same reasons as IBCS2 and COMPAT_LINUX are there. It shouldn't be and isn't used after config time, except to complicate the svr4 module makefile. Moved options for emulators to a separate section. --- sys/conf/options.i386 | 19 +++++++++---------- sys/conf/options.pc98 | 19 +++++++++---------- sys/i386/conf/options.i386 | 19 +++++++++---------- sys/pc98/conf/options.pc98 | 19 +++++++++---------- 4 files changed, 36 insertions(+), 40 deletions(-) (limited to 'sys') diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 384638b..1bd8511 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -6,17 +6,7 @@ USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h PMAP_SHPGPERPROC opt_pmap.h - -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h - -DEBUG_LINUX opt_linux.h - -COMPAT_SVR4 opt_svr4.h -DEBUG_SVR4 opt_svr4.h - PPC_DEBUG opt_ppc.h - SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM @@ -29,6 +19,15 @@ I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +# Options for emulators. These should only be used at config time, so +# they are handled like options for static file systems +# (see src/sys/conf/options), except for broken debugging options. +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h +DEBUG_LINUX opt_linux.h +COMPAT_SVR4 opt_dontuse.h +DEBUG_SVR4 opt_svr4.h + # i386 SMP options APIC_IO opt_global.h NAPIC opt_smp.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 7173903..da48a7a 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -6,17 +6,7 @@ USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h PMAP_SHPGPERPROC opt_pmap.h - -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h - -DEBUG_LINUX opt_linux.h - -COMPAT_SVR4 opt_svr4.h -DEBUG_SVR4 opt_svr4.h - PPC_DEBUG opt_ppc.h - SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM @@ -29,6 +19,15 @@ I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +# Options for emulators. These should only be used at config time, so +# they are handled like options for static file systems +# (see src/sys/conf/options), except for broken debugging options. +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h +DEBUG_LINUX opt_linux.h +COMPAT_SVR4 opt_dontuse.h +DEBUG_SVR4 opt_svr4.h + # i386 SMP options APIC_IO opt_global.h NAPIC opt_smp.h diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 384638b..1bd8511 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -6,17 +6,7 @@ USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h PMAP_SHPGPERPROC opt_pmap.h - -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h - -DEBUG_LINUX opt_linux.h - -COMPAT_SVR4 opt_svr4.h -DEBUG_SVR4 opt_svr4.h - PPC_DEBUG opt_ppc.h - SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM @@ -29,6 +19,15 @@ I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +# Options for emulators. These should only be used at config time, so +# they are handled like options for static file systems +# (see src/sys/conf/options), except for broken debugging options. +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h +DEBUG_LINUX opt_linux.h +COMPAT_SVR4 opt_dontuse.h +DEBUG_SVR4 opt_svr4.h + # i386 SMP options APIC_IO opt_global.h NAPIC opt_smp.h diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98 index 7173903..da48a7a 100644 --- a/sys/pc98/conf/options.pc98 +++ b/sys/pc98/conf/options.pc98 @@ -6,17 +6,7 @@ USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h PMAP_SHPGPERPROC opt_pmap.h - -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h - -DEBUG_LINUX opt_linux.h - -COMPAT_SVR4 opt_svr4.h -DEBUG_SVR4 opt_svr4.h - PPC_DEBUG opt_ppc.h - SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM @@ -29,6 +19,15 @@ I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +# Options for emulators. These should only be used at config time, so +# they are handled like options for static file systems +# (see src/sys/conf/options), except for broken debugging options. +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h +DEBUG_LINUX opt_linux.h +COMPAT_SVR4 opt_dontuse.h +DEBUG_SVR4 opt_svr4.h + # i386 SMP options APIC_IO opt_global.h NAPIC opt_smp.h -- cgit v1.1