From 9434bfa27a999690d05a196aae45f54cb05e9526 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Fri, 7 Jan 2005 11:54:18 +0000 Subject: [PATCH] 0.8.18.16: CLISP build fixes ... CUT-TO-WIDTH now takes three arguments; ... *LOAD-PATHNAME* and *COMPILE-FILE-PATHNAME* aren't absolute in CLISP, sigh. Use -TRUENAME* variants instead. ... PRINT not PRIN1 the random state after the huge bignum, otherwise most of the time is spent in the pretty printer formatting the random state to column 700000000000 ... bit more NEWS on the x86-64 merge. --- NEWS | 5 ++++- src/code/target-char.lisp | 2 +- src/compiler/x86-64/arith.lisp | 4 ++-- tests/print.impure.lisp | 2 +- tools-for-build/ucd.lisp | 4 ++-- version.lisp-expr | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index c65c3af..74a3c78 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ changes in sbcl-0.8.19 relative to sbcl-0.8.18: * new port: SBCL now works in native 64-bit mode on x86-64/Linux - platform. The port supports 61-bit fixnums and large memory spaces. + platform. The port supports 61-bit fixnums, large memory spaces + and reloading shared object files. * enhancement: saving cores with foreign code loaded is now supported on ppc/Darwin in addition to the previously supported platforms. @@ -12,6 +13,8 @@ changes in sbcl-0.8.19 relative to sbcl-0.8.18: produces an error. (thanks to Vincent Arkesteijn) * bug fix: NAMESTRING on pathnames with :WILD components in their directories works correctly. (thanks to Artem V. Andreev) + * build fix: fixed the dependence on *LOAD-PATHNAME* and + *COMPILE-FILE-PATHNAME* being absolute pathnames. * fixed some bugs revealed by Paul Dietz' test suite: ** the FORMATTER-generated functions for ~V[ conditionals require the correct number of arguments. diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp index e534058..40352d6 100644 --- a/src/code/target-char.lisp +++ b/src/code/target-char.lisp @@ -41,7 +41,7 @@ '(:relative :up :up "output") :name "ucd" :type "dat") - sb!xc:*compile-file-pathname*) + sb!xc:*compile-file-truename*) :direction :input :element-type '(unsigned-byte 8)) (let* ((length (file-length stream)) diff --git a/src/compiler/x86-64/arith.lisp b/src/compiler/x86-64/arith.lisp index 14c6e28..35cd6ac 100644 --- a/src/compiler/x86-64/arith.lisp +++ b/src/compiler/x86-64/arith.lisp @@ -1271,8 +1271,8 @@ (when (and (<= width 64) (constant-lvar-p scale) (constant-lvar-p disp)) - (cut-to-width base width) - (cut-to-width index width) + (cut-to-width base :unsigned width) + (cut-to-width index :unsigned width) 'sb!vm::%lea-mod64)) #+sb-xc-host diff --git a/tests/print.impure.lisp b/tests/print.impure.lisp index 76cb3b4..ab25c65 100644 --- a/tests/print.impure.lisp +++ b/tests/print.impure.lisp @@ -276,7 +276,7 @@ ;;; a spot of random-testing for rational printing (defvar *seed-state* (make-random-state)) -(prin1 *seed-state*) ; so that we can reproduce errors +(print *seed-state*) ; so that we can reproduce errors (let ((seed (make-random-state *seed-state*))) (loop repeat 42 do (let ((n (random (ash 1 1000) seed)) diff --git a/tools-for-build/ucd.lisp b/tools-for-build/ucd.lisp index 18c7714..4ecfdbb 100644 --- a/tools-for-build/ucd.lisp +++ b/tools-for-build/ucd.lisp @@ -5,7 +5,7 @@ (defparameter *output-directory* (merge-pathnames (make-pathname :directory '(:relative :up "output")) - (make-pathname :directory (pathname-directory *load-pathname*)))) + (make-pathname :directory (pathname-directory *load-truename*)))) (defparameter *page-size-exponent* 8) @@ -18,7 +18,7 @@ ;;; Generator (defparameter *unicode-character-database* - (make-pathname :directory (pathname-directory *load-pathname*))) + (make-pathname :directory (pathname-directory *load-truename*))) (defparameter *ucd-base* nil) diff --git a/version.lisp-expr b/version.lisp-expr index b4551f1..438ceb2 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.18.15" +"0.8.18.16" -- 1.7.10.4