From 0ae8180db142282924d16e1b7d1c54c72ed0d23c Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Mon, 11 Apr 2005 08:59:22 +0000 Subject: [PATCH] 0.8.21.34: How to lose friends and alienate people... ... actually make constant-folding failure a full warning in the cross-compiler (but not the target). ... fix the problem this reveals on x86-64. Meanwhile, "uname -p"? Change to -m. --- src/code/cross-misc.lisp | 3 +++ src/code/cross-type.lisp | 4 ++-- src/compiler/ir1opt.lisp | 10 +++++++++- tests/foreign.test.sh | 2 +- version.lisp-expr | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp index 342bc07..12d9312 100644 --- a/src/code/cross-misc.lisp +++ b/src/code/cross-misc.lisp @@ -136,6 +136,9 @@ (assert (typep array '(simple-array * (*)))) (values array start end 0)) +(defun sb!kernel:signed-byte-32-p (number) + (typep number '(signed-byte 32))) + ;;; package locking nops for the cross-compiler (defmacro without-package-locks (&body body) diff --git a/src/code/cross-type.lisp b/src/code/cross-type.lisp index 47fc196..0f34ee9 100644 --- a/src/code/cross-type.lisp +++ b/src/code/cross-type.lisp @@ -23,7 +23,7 @@ ((call :initarg :call :reader cross-type-style-warning-call) (message :reader cross-type-style-warning-message - #+cmu :initarg #+cmu :message ; (to stop bogus non-STYLE WARNING) + #+cmu #+cmu :initarg :message ; (to stop bogus non-STYLE WARNING) )) (:report (lambda (c s) (format @@ -38,7 +38,7 @@ (define-condition cross-type-giving-up-conservatively (cross-type-style-warning) ((message :initform "giving up conservatively" - #+cmu :reader #+cmu #.(gensym) ; (to stop bogus non-STYLE WARNING) + #+cmu #+cmu :reader #.(gensym) ; (to stop bogus non-STYLE WARNING) ))) ;;; This warning refers to the flexibility in the ANSI spec with diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp index 4bf7285..731ccbf 100644 --- a/src/compiler/ir1opt.lisp +++ b/src/compiler/ir1opt.lisp @@ -1126,7 +1126,15 @@ ;; COMPILER-WARNING (and thus return FAILURE-P=T ;; from COMPILE-FILE) for legal code, so we we ;; use a wimpier COMPILE-STYLE-WARNING instead. - #'compiler-style-warn + #-sb-xc-host #'compiler-style-warn + ;; On the other hand, for code we control, we + ;; should be able to work around any bug + ;; 173-related problems, and in particular we + ;; want to be alerted to calls to our own + ;; functions which aren't being folded away; a + ;; COMPILER-WARNING is butch enough to stop the + ;; SBCL build itself in its tracks. + #+sb-xc-host #'compiler-warn "constant folding") (cond ((not win) (setf (combination-kind call) :error)) diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh index 60f815a..2d7865f 100644 --- a/tests/foreign.test.sh +++ b/tests/foreign.test.sh @@ -27,7 +27,7 @@ testfilestem=${TMPDIR:-/tmp}/sbcl-foreign-test-$$ build_so() { echo building $1.so - if [ $(uname -p) = x86_64 ]; then + if [ $(uname -m) = x86_64 ]; then CFLAGS="$CFLAGS -fPIC" fi if [ $(uname) = Darwin ]; then diff --git a/version.lisp-expr b/version.lisp-expr index cebed91..562064b 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.21.33" +"0.8.21.34" -- 1.7.10.4