0.pre7.86.flaky7.5:

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

diff --git a/make-host-2.sh b/make-host-2.sh
index b2aa8d5..5e5c8e2 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -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")
@@ -50,7 +54,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
        (load "src/cold/defun-load-or-cload-xcompiler.lisp")
        (load-or-cload-xcompiler #'host-load-stem)
         (defun proclaim-target-optimization ()
-          (let ((debug (if (find :sb-show *shebang-features*) 2 1)))
+          (let ((debug (if (position :sb-show *shebang-features*) 2 1)))
            (sb-xc:proclaim `(optimize (compilation-speed 1)
                                       (debug ,debug)
                                       (sb!ext:inhibit-warnings 2)
@@ -61,13 +65,14 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
        (defun in-target-cross-compilation-mode (fn)
          "Call FN 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)
+               ;; FIXME: *TOPLEVEL-LAMBDA-MAX* should go away altogether.
+               (sb!c::*toplevel-lambda-max* 1)
                ;; Let the target know that we're the cross-compiler.
                (*features* (cons :sb-xc *features*))
                ;; We need to tweak the readtable..
@@ -88,7 +93,15 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
        (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)
@@ -96,15 +109,14 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
         ;; Let's check that the type system was reasonably sane. (It's
        ;; easy to spend a long time wandering around confused trying
        ;; to debug cold init if it wasn't.)
-       (when (find :sb-test *shebang-features*)
+       (when (position :sb-test *shebang-features*)
          (load "tests/type.after-xc.lisp"))
        ;; If you're experimenting with the system under a
         ;; cross-compilation host which supports CMU-CL-style SAVE-LISP,
         ;; this can be a good time to run it. The resulting core isn't
        ;; used in the normal build, but can be handy for experimenting
-       ;; with the system.
-        
-       (when (find :sb-show *shebang-features*)
+       ;; with the system. (See slam.sh for an example.)
+       (when (position :sb-after-xc-core *shebang-features*)
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
          )