From 03f8a6a66664e1aecd3ff00a49d2e5fc2f8657d5 Mon Sep 17 00:00:00 2001
From: rtoy <rtoy>
Date: Thu, 15 Oct 2009 15:05:51 +0000
Subject: [PATCH] As reported by Robert Swindells, cmucl-imp, 2009-10-15, we
 should not use arch_support_sse2 here in case we're running an x87 core on a
 chip with SSE2 support.

---
 lisp/FreeBSD-os.c | 4 ++--
 lisp/Linux-os.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c
index 6807a647c..4f5e9a019 100644
--- a/lisp/FreeBSD-os.c
+++ b/lisp/FreeBSD-os.c
@@ -12,7 +12,7 @@
  * Much hacked by Paul Werkowski
  * GENCGC support by Douglas Crosher, 1996, 1997.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.30 2009/06/11 16:04:01 rtoy Rel $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.31 2009/10/15 15:05:51 rtoy Exp $
  *
  */
 
@@ -340,7 +340,7 @@ restore_fpu(ucontext_t *scp)
     __asm__ __volatile__ ("fldcw %0"::"m"(*&cw));
 
 #ifdef FEATURE_SSE2
-    if (arch_support_sse2()) {
+    if (fpu_mode == SSE2) {
 	u_int32_t mxcsr = env_xmm->en_mxcsr;
 
 	DPRINTF(0, (stderr, "restore_fpu:  mxcsr (raw) = %04x\n", mxcsr));
diff --git a/lisp/Linux-os.c b/lisp/Linux-os.c
index 3559437dc..60ee9ff9f 100644
--- a/lisp/Linux-os.c
+++ b/lisp/Linux-os.c
@@ -15,7 +15,7 @@
  * GENCGC support by Douglas Crosher, 1996, 1997.
  * Alpha support by Julian Dolby, 1999.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.43 2009/01/06 02:28:14 agoncharov Rel $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.44 2009/10/15 15:05:51 rtoy Exp $
  *
  */
 
@@ -430,7 +430,7 @@ restore_fpu(ucontext_t *context)
         DPRINTF(0, (stderr, "restore_fpu:  cw = %08x\n", cw));
 	__asm__ __volatile__ ("fldcw %0" : : "m" (*&cw));
 #ifdef FEATURE_SSE2
-        if (arch_support_sse2()) {
+        if (fpu_mode == SSE2) {
             struct _fpstate *fpstate;
             unsigned int mxcsr;
             
-- 
GitLab