Fix deadlocks in GC on Windows.

[sbcl.git] / src / cold / warm.lisp

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 3aff541..bab0527 100644 (file)
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -59,24 +59,12 @@
   (rename-package package
                   (package-name package)
                   (cons "SB-C-CALL" (package-nicknames package))))
+
+(let ((package (find-package "SB-SEQUENCE")))
+  (rename-package package (package-name package) (list "SEQUENCE")))
 \f
 ;;;; compiling and loading more of the system
 
-(let* ((sys *default-pathname-defaults*)
-       (src
-        (merge-pathnames
-         (make-pathname :directory '(:relative "src" :wild-inferiors)
-                        :name :wild :type :wild)
-         sys))
-       (contrib
-        (merge-pathnames
-         (make-pathname :directory '(:relative "contrib" :wild-inferiors)
-                        :name :wild :type :wild)
-         sys)))
-  (setf (logical-pathname-translations "SYS")
-        `(("SYS:SRC;**;*.*.*" ,src)
-          ("SYS:CONTRIB;**;*.*.*" ,contrib))))
-
 ;;; FIXME: CMU CL's pclcom.lisp had extra optional stuff wrapped around
 ;;; COMPILE-PCL, at least some of which we should probably have too:
 ;;;
@@ -122,9 +110,9 @@
                 "SRC;PCL;DEFCLASS"
                 "SRC;PCL;DEFS"
                 "SRC;PCL;FNGEN"
+                "SRC;PCL;WRAPPER"
                 "SRC;PCL;CACHE"
                 "SRC;PCL;DLISP"
-                "SRC;PCL;DLISP2"
                 "SRC;PCL;BOOT"
                 "SRC;PCL;VECTOR"
                 "SRC;PCL;SLOTS-BOOT"
@@ -159,6 +147,9 @@
                 "SRC;PCL;GRAY-STREAMS-CLASS"
                 "SRC;PCL;GRAY-STREAMS"
 
+                ;; CLOS-level support for User-extensible sequences.
+                "SRC;PCL;SEQUENCE"
+
                 ;; other functionality not needed for cold init, moved
                 ;; to warm init to reduce peak memory requirement in
                 ;; cold init
@@ -168,13 +159,9 @@
                 "SRC;CODE;PROFILE"
                 "SRC;CODE;NTRACE"
                 "SRC;CODE;STEP"
-                "SRC;CODE;RUN-PROGRAM"
-
-                ;; Code derived from PCL's pre-ANSI DESCRIBE-OBJECT
-                ;; facility is still used in our ANSI DESCRIBE
-                ;; facility, and should be compiled and loaded after
-                ;; our DESCRIBE facility is compiled and loaded.
-                "SRC;PCL;DESCRIBE"))
+                "SRC;CODE;WARM-LIB"
+                #+win32 "SRC;CODE;WARM-MSWIN"
+                "SRC;CODE;RUN-PROGRAM"))
 
   (let ((fullname (concatenate 'string "SYS:" stem ".LISP")))
     (sb-int:/show "about to compile" fullname)
@@ -187,7 +174,9 @@
       (tagbody
        retry-compile-file
          (multiple-value-bind (output-truename warnings-p failure-p)
-             (compile-file fullname)
+             (if *compile-files-p*
+                 (compile-file fullname)
+                 (compile-file-pathname fullname))
            (declare (ignore warnings-p))
            (sb-int:/show "done compiling" fullname)
            (cond ((not output-truename)