X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-fasl.lisp;h=9e95f1c8497f2aa3df62624e53dd57f8cb0ff175;hb=67dc5cf478dfe5e3f517001febb9a8f7b922eacf;hp=5115bcb040990f1e7820cfc23af9e38ea6ca7d73;hpb=e1cf2466998905e8e19e14cae6e478861ffd04ee;p=sbcl.git diff --git a/src/code/early-fasl.lisp b/src/code/early-fasl.lisp index 5115bcb..9e95f1c 100644 --- a/src/code/early-fasl.lisp +++ b/src/code/early-fasl.lisp @@ -35,7 +35,7 @@ (macrolet ((define-fasl-format-features () (let (;; master value for *F-P-A-F-F* - (fpaff '(:sb-thread))) + (fpaff '(:sb-thread :sb-package-locks))) `(progn ;; a list of *(SHEBANG-)FEATURES* flags which affect ;; binary compatibility, i.e. which must be the same @@ -76,7 +76,7 @@ ;;; versions which break binary compatibility. But it certainly should ;;; be incremented for release versions which break binary ;;; compatibility. -(def!constant +fasl-file-version+ 50) +(def!constant +fasl-file-version+ 51) ;;; (record of versions before 2003 deleted in 2003-04-26/0.pre8.107 or so) ;;; 38: (2003-01-05) changed names of internal SORT machinery ;;; 39: (2003-02-20) in 0.7.12.1 a slot was added to @@ -108,6 +108,8 @@ ;;; 49: (2004-05-04) Changed implementation of DEFFOO macros and the ;;; functions they expand to. ;;; 50: (2004-05-20) Changed %COMPILER-DEFUN signature again. +;;; 51: (2004-07-24) Package locks (SBCL 0.8.12.7) changed signature of +;;; %DEFPACKAGE. ;;; the conventional file extension for our fasl files (declaim (type simple-string *fasl-file-type*)) @@ -119,16 +121,9 @@ ;;; Assembler routines are named by full Lisp symbols: they ;;; have packages and that sort of native Lisp stuff associated ;;; with them. We can compare them with EQ. -;;; Foreign symbols are named by Lisp STRINGs: the Lisp package -;;; system doesn't extend out to symbols in languages like C. -;;; We want to use EQUAL to compare them. -;;; *STATIC-FOREIGN-SYMBOLS* are static as opposed to "dynamic" (not -;;; as opposed to C's "extern"). The table contains symbols known at -;;; the time that the program was built, but not symbols defined -;;; in object files which have been loaded dynamically since then. -(declaim (type hash-table *assembler-routines* *static-foreign-symbols*)) +(declaim (type hash-table *assembler-routines*)) (defvar *assembler-routines* (make-hash-table :test 'eq)) -(defvar *static-foreign-symbols* (make-hash-table :test 'equal)) + ;;;; the FOP database @@ -144,9 +139,6 @@ :initial-element (lambda () (error "corrupt fasl file: losing FOP")))) -;;;; other miscellaneous loading-related stuff - - ;;;; variables (defvar *load-depth* 0 @@ -158,15 +150,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) -