From: Nikodemus Siivola Date: Mon, 30 Apr 2007 10:35:32 +0000 (+0000) Subject: 1.0.5.12: fix threaded Linux builds X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9788b728b947d70f486188e36e4e817733b06a78;p=sbcl.git 1.0.5.12: fix threaded Linux builds * Undo merge damage: missed one COMPARE-AND-EXCHANGE -> COMPARE-AND-SWAP rename. --- diff --git a/src/code/target-thread.lisp b/src/code/target-thread.lisp index 56ead78..8185b81 100644 --- a/src/code/target-thread.lisp +++ b/src/code/target-thread.lisp @@ -268,7 +268,7 @@ until it is available." (setf (mutex-value mutex) new-value)) #!-sb-lutex (let (old) - (when (and (setf old (compare-and-exchange-mutex-value mutex nil new-value)) + (when (and (setf old (compare-and-swap-mutex-value mutex nil new-value)) waitp) (loop while old do (multiple-value-bind (to-sec to-usec) (decode-timeout nil) @@ -278,7 +278,7 @@ until it is available." (or to-sec -1) (or to-usec 0)))) (signal-deadline))) - (setf old (compare-and-exchange-mutex-value mutex nil new-value)))) + (setf old (compare-and-swap-mutex-value mutex nil new-value)))) (not old)))) (defun release-mutex (mutex) diff --git a/version.lisp-expr b/version.lisp-expr index 5a08693..6bdba7d 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".) -"1.0.5.11" +"1.0.5.12"