0.7.10.18:

[sbcl.git] / make-host-2.sh

diff --git a/make-host-2.sh b/make-host-2.sh
index dd6751e..e266d77 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -29,7 +29,7 @@ rm -f output/after-xc.core
 # that we used to compile it:
 #   (1) It reduces the chance that the cross-compilation process
 #       inadvertently comes to depend on some weird compile-time
-#       side-effect.
+#       side effect.
 #   (2) It reduces peak memory demand (because definitions wrapped in
 #       (EVAL-WHEN (:COMPILE-TOPLEVEL :EXECUTE) ..) aren't defined
 #       in the fresh image).
@@ -41,6 +41,10 @@ rm -f output/after-xc.core
 # an enormously important disadvantage, either.)
 echo //running cross-compiler to create target object files
 $SBCL_XC_HOST <<-'EOF' || exit 1
+
+        ;;;
+        ;;; Set up the cross-compiler.
+        ;;;
        (setf *print-level* 5 *print-length* 5)
        (load "src/cold/shared.lisp")
        (in-package "SB-COLD")
@@ -54,20 +58,24 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
            (sb-xc:proclaim `(optimize (compilation-speed 1)
                                       (debug ,debug)
                                       (sb!ext:inhibit-warnings 2)
-                                       (safety 3)
+                                      ;; SAFETY = SPEED (and < 3) should 
+                                      ;; reasonable safety, but might skip 
+                                      ;; some unreasonably expensive stuff
+                                      ;; (e.g. %DETECT-STACK-EXHAUSTION
+                                      ;; in sbcl-0.7.2).
+                                       (safety 2)
                                        (space 1)
                                       (speed 2)))))
         (compile 'proclaim-target-optimization)
-       (defun in-target-cross-compilation-mode (fn)
-         "Call FN with everything set up appropriately for cross-compiling
+       (defun in-target-cross-compilation-mode (fun)
+         "Call FUN with everything set up appropriately for cross-compiling
          a target file."
-         (let (;; Life is simpler at genesis/cold-load time if we
-               ;; needn't worry about byte-compiled code.
-               (sb!ext:*byte-compile-top-level* nil)
-               ;; In order to reduce peak memory usage during GENESIS,
-               ;; it helps to stuff several toplevel forms together 
-               ;; into the same function.
-               (sb!c::*top-level-lambda-max* 10)
+         (let (;; In order to increase microefficiency of the target Lisp, 
+               ;; enable old CMU CL defined-function-types-never-change
+               ;; optimizations. (ANSI says users aren't supposed to
+               ;; redefine our functions anyway; and developers can
+               ;; fend for themselves.)
+               #!-sb-fluid (sb!ext:*derive-function-types* t)
                ;; Let the target know that we're the cross-compiler.
                (*features* (cons :sb-xc *features*))
                ;; We need to tweak the readtable..
@@ -82,13 +90,21 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
             (proclaim-target-optimization)
             ;; Specify where target machinery lives.
             (with-additional-nickname ("SB-XC" "SB!XC")
-              (funcall fn))))
+              (funcall fun))))
        (compile 'in-target-cross-compilation-mode)
-       (setf *target-compile-file* 'sb-xc:compile-file)
-       (setf *target-assemble-file* 'sb!c:assemble-file)
+       (setf *target-compile-file* #'sb-xc:compile-file)
+       (setf *target-assemble-file* #'sb!c:assemble-file)
        (setf *in-target-compilation-mode-fn*
              #'in-target-cross-compilation-mode)
+
+        ;;;
+        ;;; Run the cross-compiler to produce cold fasl files.
+        ;;;
        (load "src/cold/compile-cold-sbcl.lisp")
+ 
+        ;;; 
+        ;;; miscellaneous tidying up and saving results
+        ;;; 
        (let ((filename "output/object-filenames-for-genesis.lisp-expr"))
          (ensure-directories-exist filename :verbose t)
          (with-open-file (s filename :direction :output)
@@ -107,6 +123,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
          )
+        #+cmu (ext:quit)
        EOF
 
 # Run GENESIS (again) in order to create cold-sbcl.core. (The first