From: Nikodemus Siivola Date: Tue, 29 Jun 2004 18:54:02 +0000 (+0000) Subject: 0.8.12.12: Restore buildability with :SB-FUTEX and :SB-PACKAGE-LOCKS. X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=6bb7ec8c220863904aebfbee95fb13805ef1f4e7;p=sbcl.git 0.8.12.12: Restore buildability with :SB-FUTEX and :SB-PACKAGE-LOCKS. Reported by Kevin Rosenberg on #lisp. --- diff --git a/src/code/target-thread.lisp b/src/code/target-thread.lisp index 69860df..8678534 100644 --- a/src/code/target-thread.lisp +++ b/src/code/target-thread.lisp @@ -242,11 +242,12 @@ time we reacquire LOCK and return to the caller." (defun maybe-install-futex-functions () #!+sb-futex (unless (zerop (extern-alien "linux_supports_futex" int)) - (setf (fdefinition 'get-mutex) #'get-mutex/futex - (fdefinition 'release-mutex) #'release-mutex/futex - (fdefinition 'condition-wait) #'condition-wait/futex - (fdefinition 'condition-broadcast) #'condition-broadcast/futex - (fdefinition 'condition-notify) #'condition-notify/futex) + (sb!ext:without-package-locks + (setf (fdefinition 'get-mutex) #'get-mutex/futex + (fdefinition 'release-mutex) #'release-mutex/futex + (fdefinition 'condition-wait) #'condition-wait/futex + (fdefinition 'condition-broadcast) #'condition-broadcast/futex + (fdefinition 'condition-notify) #'condition-notify/futex)) t)) (defun make-thread (function) diff --git a/version.lisp-expr b/version.lisp-expr index 8480117..e81dfd4 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.12.11" +"0.8.12.12"