0.6.11.40:

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

diff --git a/make-host-2.sh b/make-host-2.sh
index a3c2986..63e4512 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -64,22 +64,6 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
                (sb!c::*top-level-lambda-max* 10)
                ;; Let the target know that we're the cross-compiler.
                (*features* (cons :sb-xc *features*))
-               ;; the CROSS-FLOAT-INFINITY-KLUDGE: When building a
-               ;; compiler which runs under the SBCL runtime, which
-               ;; supports floating point infinities, it's safe to
-               ;; build with true PROPAGATE-FLOAT-TYPE and
-               ;; PROPAGATE-FUN-TYPE features. (It wasn't safe
-               ;; when building a cross-compiler to run under the
-               ;; cross-compilation host Lisp).
-               #+nil ; FIXME: suppressed since 0.6.11.3 has no fp infinities
-               (sb-cold:*shebang-features*
-                (substitute
-                 :propagate-float-type
-                 :will-propagate-float-type
-                 (substitute
-                  :propagate-fun-type
-                  :will-propagate-fun-type
-                  sb-cold:*shebang-features*)))
                ;; We need to tweak the readtable..
                (*readtable* (copy-readtable)))
             ;; ..in order to make backquotes expand into target code
@@ -103,6 +87,11 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
          (ensure-directories-exist filename :verbose t)
          (with-open-file (s filename :direction :output)
            (write *target-object-file-names* :stream s :readably t)))
+        ;; 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*)
+         (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