From 72fc4e4a1325e8761d97a36080fa50a8e75ed523 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Thu, 9 Feb 2006 10:09:18 +0000 Subject: [PATCH] 0.9.9.24: Fix build on ppc (sb- -> sb!) --- src/code/fd-stream.lisp | 8 ++++---- src/compiler/ppc/arith.lisp | 2 +- tests/compiler.pure.lisp | 34 +++++++++++++++++----------------- version.lisp-expr | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp index a84133e..4d87332 100644 --- a/src/code/fd-stream.lisp +++ b/src/code/fd-stream.lisp @@ -1266,10 +1266,10 @@ (head (fd-stream-ibuf-head stream)) (byte (sap-ref-8 sap head)) (size ,in-size-expr)) - (input-at-least stream size) - (let ((sap (fd-stream-ibuf-sap stream)) - (head (fd-stream-ibuf-head stream))) - ,in-expr)) + (input-at-least stream size) + (let ((sap (fd-stream-ibuf-sap stream)) + (head (fd-stream-ibuf-head stream))) + ,in-expr)) nil) (return)))) (setf *external-formats* diff --git a/src/compiler/ppc/arith.lisp b/src/compiler/ppc/arith.lisp index a0288fb..9e675f8 100644 --- a/src/compiler/ppc/arith.lisp +++ b/src/compiler/ppc/arith.lisp @@ -667,7 +667,7 @@ (movable foldable flushable)) (defun %%ldb (integer size posn) - (sb-kernel::%ldb size posn integer)) + (sb!kernel::%ldb size posn integer)) (define-vop (ldb-c/fixnum) (:translate %%ldb) diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp index e68cfe0..e2eac2f 100644 --- a/tests/compiler.pure.lisp +++ b/tests/compiler.pure.lisp @@ -1944,7 +1944,7 @@ nil '(lambda (a) (declare (type (integer 21 28) a)) - (declare (optimize (compilation-speed 1) (safety 2) + (declare (optimize (compilation-speed 1) (safety 2) (speed 0) (debug 0) (space 1))) (let* ((v7 (flet ((%f3 (f3-1 f3-2) (loop for lv2 below 1 @@ -1958,22 +1958,22 @@ ;;; MISC.626: bandaged AVER was still wrong (assert (eql -829253 - (funcall - (compile - nil - '(lambda (a) - (declare (type (integer -902970 2) a)) - (declare (optimize (space 2) (debug 0) (compilation-speed 1) - (speed 0) (safety 3))) - (prog2 (if (logbitp 30 a) 0 (block b3 0)) a))) - -829253))) + (funcall + (compile + nil + '(lambda (a) + (declare (type (integer -902970 2) a)) + (declare (optimize (space 2) (debug 0) (compilation-speed 1) + (speed 0) (safety 3))) + (prog2 (if (logbitp 30 a) 0 (block b3 0)) a))) + -829253))) ;; MISC.628: constant-folding %LOGBITP was buggy (assert (eql t - (funcall - (compile - nil - '(lambda () - (declare (optimize (safety 3) (space 3) (compilation-speed 3) - (speed 0) (debug 1))) - (not (not (logbitp 0 (floor 2147483651 (min -23 0)))))))))) + (funcall + (compile + nil + '(lambda () + (declare (optimize (safety 3) (space 3) (compilation-speed 3) + (speed 0) (debug 1))) + (not (not (logbitp 0 (floor 2147483651 (min -23 0)))))))))) diff --git a/version.lisp-expr b/version.lisp-expr index d37beec..4e036a8 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.9.9.23" +"0.9.9.24" -- 1.7.10.4