summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2005-07-02 20:06:44 +0000
committerdelphij <delphij@FreeBSD.org>2005-07-02 20:06:44 +0000
commit019106f6e576eb8e05e7b5b562d7115dd05ba567 (patch)
treef712cf3be64a135dbc1f4e04704add0988835f8e /sys/pc98
parent696ddfbe750f1c4366a789f2a656f2ff955fd9d8 (diff)
downloadFreeBSD-src-019106f6e576eb8e05e7b5b562d7115dd05ba567.zip
FreeBSD-src-019106f6e576eb8e05e7b5b562d7115dd05ba567.tar.gz
Remove the CPU_ENABLE_SSE option from the i386 and pc98 architectures,
as they are already default for I686_CPU for almost 3 years, and CPU_DISABLE_SSE always disables it. On the other hand, CPU_ENABLE_SSE does not work for I486_CPU and I586_CPU. This commit has: - Removed the option from conf/options.* - Removed the option and comments from MD NOTES files - Simplified the CPU_ENABLE_SSE ifdef's so they don't deal with CPU_ENABLE_SSE from kernel configuration. (*) For most users, this commit should be largely no-op. If you used to place CPU_ENABLE_SSE into your kernel configuration for some reason, it is time to remove it. (*) The ifdef's of CPU_ENABLE_SSE are not removed at this point, since we need to change it to !defined(CPU_DISABLE_SSE) && defined(I686_CPU), not just !defined(CPU_DISABLE_SSE), if we really want to do so. Discussed on: -arch Approved by: re (scottl)
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/conf/NOTES4
-rw-r--r--sys/pc98/pc98/machdep.c5
2 files changed, 1 insertions, 8 deletions
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 86f1426..dcac1e7 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -88,9 +88,6 @@ cpu I686_CPU # aka Pentium Pro(tm)
#
# CPU_DISABLE_SSE explicitly prevents I686_CPU from turning on SSE.
#
-# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. This is default
-# on I686_CPU and above.
-#
# CPU_FASTER_5X86_FPU enables faster FPU exception handler.
#
# CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products
@@ -156,7 +153,6 @@ options CPU_DIRECT_MAPPED_CACHE
options CPU_DISABLE_5X86_LSSER
options CPU_DISABLE_CMPXCHG
#options CPU_DISABLE_SSE
-options CPU_ENABLE_SSE
options CPU_FASTER_5X86_FPU
options CPU_I486_ON_386
options CPU_IORT
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index fa9c058..5c2fa32 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -147,12 +147,9 @@ extern void initializecpu(void);
#define CS_SECURE(cs) (ISPL(cs) == SEL_UPL)
#define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
-#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU)
+#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
#define CPU_ENABLE_SSE
#endif
-#if defined(CPU_DISABLE_SSE)
-#undef CPU_ENABLE_SSE
-#endif
static void cpu_startup(void *);
static void fpstate_drop(struct thread *td);
OpenPOWER on IntegriCloud