[Sbcl-commits] master: fix unthreaded builds with sb-futex in target *features*

[Nikodemus S. <de...@us...>]

The branch "master" has been updated in SBCL:
       via  3cfc1f0bc414d2db71de519152d72d479f1f6232 (commit)
      from  c1a82b81e6249ec7b3103ff9a65fce4d440c298f (commit)

- Log -----------------------------------------------------------------
commit 3cfc1f0bc414d2db71de519152d72d479f1f6232
Author: Nikodemus Siivola <nik...@ra...>
Date:   Sun Nov 27 05:24:42 2011 -0800

    fix unthreaded builds with sb-futex in target *features*
---
 src/code/target-thread.lisp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/code/target-thread.lisp b/src/code/target-thread.lisp
index 06d49c2..948032b 100644
--- a/src/code/target-thread.lisp
+++ b/src/code/target-thread.lisp
@@ -435,11 +435,11 @@ HOLDING-MUTEX-P."
     #!-sb-thread
     (when old
       (error "Strange deadlock on ~S in an unithreaded build?" mutex))
-    #!-sb-futex
+    #!-(and sb-thread sb-futex)
     (and (not old)
          ;; Don't even bother to try to CAS if it looks bad.
          (not (sb!ext:compare-and-swap (mutex-%owner mutex) nil new-owner)))
-    #!+sb-futex
+    #!+(and sb-thread sb-futex)
     ;; From the Mutex 2 algorithm from "Futexes are Tricky" by Ulrich Drepper.
     (when (eql +lock-free+ (sb!ext:compare-and-swap (mutex-state mutex)
                                                     +lock-free+
@@ -606,7 +606,7 @@ IF-NOT-OWNER is :FORCE)."
       ;; FIXME: Is a :memory barrier too strong here?  Can we use a :write
       ;; barrier instead?
       (barrier (:memory)))
-    #!+sb-futex
+    #!+(and sb-thread sb-futex)
     (when old-owner
       ;; FIXME: once ATOMIC-INCF supports struct slots with word sized
       ;; unsigned-byte type this can be used:
@@ -633,7 +633,7 @@ IF-NOT-OWNER is :FORCE)."
   #!+sb-doc
   "Waitqueue type."
   (name nil :type (or null thread-name))
-  #!+sb-futex
+  #!+(and sb-thread sb-futex)
   (token nil))
 
 #!+(and sb-thread (not sb-futex))

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL