X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-host-2.sh;h=e266d770161f6af1462e7dc67427bb411ee332c3;hb=50f728671defadb8f7b1e8691c984cb0e6aba17c;hp=5e5c8e28e632225283b5460b26dcf4dd8d37097f;hpb=0cfad881b88e03971a2b3ef0c0c0fc2e5f4f1bc8;p=sbcl.git

diff --git a/make-host-2.sh b/make-host-2.sh
index 5e5c8e2..e266d77 100644
--- 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).
@@ -58,12 +58,17 @@ $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 (;; In order to increase microefficiency of the target Lisp, 
 		;; enable old CMU CL defined-function-types-never-change
@@ -71,8 +76,6 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 		;; 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..
@@ -87,10 +90,10 @@ $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)
 
@@ -120,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