From fdc38abbd1ef5b211c9db03c72e1730284c6edbb Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Mon, 5 Jul 2004 02:30:42 +0000 Subject: [PATCH] 0.8.12.22: Minor changes to make SBCL build itself cleanly with package locks enabled. --- src/code/early-fasl.lisp | 14 -------------- src/code/target-misc.lisp | 13 +++++++++++++ src/cold/shared.lisp | 11 ----------- src/compiler/ltn.lisp | 6 +++--- version.lisp-expr | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/code/early-fasl.lisp b/src/code/early-fasl.lisp index 4f80e72..11b57b4 100644 --- a/src/code/early-fasl.lisp +++ b/src/code/early-fasl.lisp @@ -144,9 +144,6 @@ :initial-element (lambda () (error "corrupt fasl file: losing FOP")))) -;;;; other miscellaneous loading-related stuff - - ;;;; variables (defvar *load-depth* 0 @@ -158,15 +155,4 @@ (defvar *fasl-input-stream*) (declaim (type ansi-stream *fasl-input-stream*)) -(defvar *load-print* nil - #!+sb-doc - "the default for the :PRINT argument to LOAD") - -(defvar *load-verbose* nil - ;; Note that CMU CL's default for this was T, and ANSI says it's - ;; implementation-dependent. We choose NIL on the theory that it's - ;; a nicer default behavior for Unix programs. - #!+sb-doc - "the default for the :VERBOSE argument to LOAD") - (defvar *load-code-verbose* nil) diff --git a/src/code/target-misc.lisp b/src/code/target-misc.lisp index 7b07e83..4203f4f 100644 --- a/src/code/target-misc.lisp +++ b/src/code/target-misc.lisp @@ -223,3 +223,16 @@ the file system." (defun %byte-blt (src src-start dst dst-start dst-end) (%byte-blt src src-start dst dst-start dst-end)) + +;;;; some *LOAD-FOO* variables + +(defvar *load-print* nil + #!+sb-doc + "the default for the :PRINT argument to LOAD") + +(defvar *load-verbose* nil + ;; Note that CMU CL's default for this was T, and ANSI says it's + ;; implementation-dependent. We choose NIL on the theory that it's + ;; a nicer default behavior for Unix programs. + #!+sb-doc + "the default for the :VERBOSE argument to LOAD") diff --git a/src/cold/shared.lisp b/src/cold/shared.lisp index 5f86752..95f125a 100644 --- a/src/cold/shared.lisp +++ b/src/cold/shared.lisp @@ -23,17 +23,6 @@ (in-package "SB-COLD") -;;; FIXME: This is embarassing -- SBCL violates SBCL style-package -;;; locks on the host lisp. Rather then find and fix all the cases -;;; right now, let's just remain self-hosting. The problems at least -;;; involve a few defvars and local macros with names in the CL -;;; package. -#+sbcl -(let ((plp (find-symbol PACKAGE-LOCKED-P :sb-ext))) - (when (and plp (fboundp plp)) - (dolist (p (list-all-packages)) - (sb-ext::unlock-package p)))) - ;;; prefixes for filename stems when cross-compiling. These are quite arbitrary ;;; (although of course they shouldn't collide with anything we don't want to ;;; write over). In particular, they can be either relative path names (e.g. diff --git a/src/compiler/ltn.lisp b/src/compiler/ltn.lisp index 751d204..bbdb87a 100644 --- a/src/compiler/ltn.lisp +++ b/src/compiler/ltn.lisp @@ -695,13 +695,13 @@ (when (losers) (collect ((messages) - (count 0 +)) + (notes 0 +)) (flet ((lose1 (string &rest stuff) (messages string) (messages stuff))) (dolist (loser (losers)) (when (and *efficiency-note-limit* - (>= (count) *efficiency-note-limit*)) + (>= (notes) *efficiency-note-limit*)) (lose1 "etc.") (return)) (let* ((type (template-type loser)) @@ -720,7 +720,7 @@ (t (aver (ltn-policy-safe-p ltn-policy)) (lose1 "can't trust output type assertion under safe policy"))) - (count 1)))) + (notes 1)))) (let ((*compiler-error-context* call)) (compiler-notify "~{~?~^~&~6T~}" diff --git a/version.lisp-expr b/version.lisp-expr index 22e966d..acc72be 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.21" +"0.8.12.22" -- 1.7.10.4