0.7.1.26:

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

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 70d8c95..05c7539 100644 (file)
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -27,17 +27,18 @@
 ;;;; do belong in cold load and will hopefully make it back there reasonably
 ;;;; soon). -- WHN 19991207
 
-(dolist (stem '(;; FIXME: The files here from outside the src/pcl directory
-               ;; probably belong in cold load instead of warm load. They
-               ;; ended up here as a quick hack to work around the
-               ;; consequences of my misunderstanding how ASSEMBLE-FILE works
-               ;; when I wrote the cold build code. The cold build code
-               ;; expects only one FASL filename per source file, when it
-               ;; turns out we really need one FASL file for ASSEMBLE-FILE
-               ;; output and another for COMPILE-FILE output. It would
-               ;; probably be good to redo the cold build code so that the
-               ;; COMPILE-FILE stuff generated here can be loaded at the same
-               ;; time as the ASSEMBLE-FILE stuff generated there.
+(dolist (stem '(;; FIXME: The assembly files here probably belong in
+               ;; cold load instead of warm load. They ended up here
+               ;; as a quick hack to work around the consequences of
+               ;; my misunderstanding how ASSEMBLE-FILE works when I
+               ;; wrote the cold build code. The cold build code
+               ;; expects only one FASL filename per source file,
+               ;; when it turns out we really need one FASL file for
+               ;; ASSEMBLE-FILE output and another for COMPILE-FILE
+               ;; output. It would probably be good to redo the cold
+               ;; build code so that the COMPILE-FILE stuff generated
+               ;; here can be loaded at the same time as the
+               ;; ASSEMBLE-FILE stuff generated there.
                "src/assembly/target/assem-rtns"
                "src/assembly/target/array"
                "src/assembly/target/arith"
@@ -46,9 +47,9 @@
   ;; (Hopefully this will go away as we move the files above into cold load.)
   ;; -- WHN 19991214
   (let ((fullname (concatenate 'string stem ".lisp")))
-    ;; (Now that we use the byte compiler for interpretation,
-    ;; /SHOW doesn't get compiled properly until the src/assembly
-    ;; files have been loaded.)
+    ;; (Now that we use byte compiler for interpretation, /SHOW
+    ;; doesn't get compiled properly until the src/assembly files have
+    ;; been loaded, so we use PRINT instead.)
     #+sb-show (print "/about to compile src/assembly file")
     #+sb-show (print fullname)
     (multiple-value-bind
@@ -89,6 +90,15 @@
                          new-package-name
                          (package-nicknames package)))))))
 
+;;; FIXME: This nickname is a deprecated hack for backwards
+;;; compatibility with code which assumed the CMU-CL-style
+;;; SB-ALIEN/SB-C-CALL split. That split went away and was deprecated
+;;; in 0.7.0, so we should get rid of this nickname after a while.
+(let ((package (find-package "SB-ALIEN")))
+  (rename-package package
+                 (package-name package)
+                 (cons "SB-C-CALL" (package-nicknames package))))
+
 ;;; KLUDGE: This is created here (instead of in package-data-list.lisp-expr)
 ;;; because it doesn't have any symbols in it, so even if it's
 ;;; present at cold load time, genesis thinks it's unimportant
@@ -146,21 +156,20 @@
 ;;;
 ;;; FIXME: This has mutated into a hack which crudely duplicates
 ;;; functionality from the existing mechanism to load files from
-;;; stems-and-flags.lisp-expr, without being quite parallel. (E.g.
-;;; object files end up alongside the source files instead of ending
-;;; up in parallel directory trees.) Maybe we could merge the
-;;; filenames here into stems-and-flags.lisp-expr with some new flag
-;;; (perhaps :WARM) to indicate that the files should be handled not
-;;; in cold load but afterwards. Alternatively, we could call
-(dolist (stem '(
-               ;; CLOS, derived from the PCL reference implementation
+;;; build-order.lisp-expr, without being quite parallel. (E.g. object
+;;; files end up alongside the source files instead of ending up in
+;;; parallel directory trees.) Maybe we could merge the filenames here
+;;; into build-order.lisp-expr with some new flag (perhaps :WARM) to
+;;; indicate that the files should be handled not in cold load but
+;;; afterwards. 
+(dolist (stem '(;; CLOS, derived from the PCL reference implementation
                ;;
                ;; This PCL build order is based on a particular
                ;; linearization of the declared build order
                ;; dependencies from the old PCL defsys.lisp
                ;; dependency database.
                "src/pcl/walk"
-               "src/pcl/iterate"
+                ;; "src/pcl/iterate" removed 2001-12-20 njf
                "src/pcl/early-low"
                "src/pcl/macros"
                 "src/pcl/compiler-support"
@@ -190,7 +199,6 @@
                "src/pcl/fixup"
                "src/pcl/defcombin"
                "src/pcl/ctypes"
-               "src/pcl/construct"
                "src/pcl/env"
                "src/pcl/documentation"
                "src/pcl/print-object"