X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fshared.lisp;h=479b426c90ce4870f377745555c101ee76c670fb;hb=1a4f36e402af22d470cf619643d2473c1dc58e12;hp=d8d6f446925728c75d58063337b5adaf2e8fcf69;hpb=b42c75203a3f077e8f59373a48af5e3a304addbf;p=sbcl.git

diff --git a/src/cold/shared.lisp b/src/cold/shared.lisp
index d8d6f44..479b426 100644
--- a/src/cold/shared.lisp
+++ b/src/cold/shared.lisp
@@ -33,24 +33,6 @@
 (defvar *host-obj-prefix*)
 (defvar *target-obj-prefix*)
 
-;;; suffixes for filename stems when cross-compiling
-(defvar *host-obj-suffix*
-  (or
-   ;; On some xc hosts, it's impossible to LOAD a fasl file unless it
-   ;; has the same extension that the host uses for COMPILE-FILE
-   ;; output, so we have to be careful to use the xc host's preferred
-   ;; extension.
-   ;;
-   ;; FIXME: This is a little ugly and annoying to maintain. And
-   ;; there's very likely some way to rearrange the build process so
-   ;; that we never explicitly refer to host object file suffixes,
-   ;; only to the result of CL:COMPILE-FILE-PATHNAME.
-   #+lispworks ".ufsl" ; as per Lieven Marchand sbcl-devel 2002-02-01
-   #+(and openmcl (not darwin)) ".pfsl"
-   #+(and openmcl darwin) ".dfsl"
-   ;; On most xc hosts, any old extension works, so we use an
-   ;; arbitrary one.
-   ".lisp-obj"))
 (defvar *target-obj-suffix*
   ;; Target fasl files are LOADed (actually only quasi-LOADed, in
   ;; GENESIS) only by SBCL code, and it doesn't care about particular
@@ -131,7 +113,7 @@
 (setf *shebang-features*
       (let* ((default-features
                (append (read-from-file "base-target-features.lisp-expr")
-                       (read-from-file "local-target-features.lisp-expr")))
+                       (eval (read-from-file "local-target-features.lisp-expr"))))
              (customizer-file-name "customize-target-features.lisp")
              (customizer (if (probe-file customizer-file-name)
                              (compile nil
@@ -157,6 +139,49 @@
   (format t
           "target backend-subfeatures *SHEBANG-BACKEND-FEATURES*=~@<~S~:>~%"
           *shebang-backend-subfeatures*))
+
+;;; Some feature combinations simply don't work, and sometimes don't
+;;; fail until quite a ways into the build.  Pick off the more obvious
+;;; combinations now, and provide a description of what the actual
+;;; failure is (not always obvious from when the build fails).
+(let ((feature-compatability-tests
+       '(("(and sb-thread (not gencgc))"
+          ":SB-THREAD requires :GENCGC")
+         ("(and sb-thread (not (or ppc x86 x86-64)))"
+          ":SB-THREAD not supported on selected architecture")
+         ("(and gencgc cheneygc)"
+          ":GENCGC and :CHENEYGC are incompatible")
+         ("(and cheneygc (not (or alpha hppa mips ppc sparc)))"
+          ":CHENEYGC not supported on selected architecture")
+         ("(and gencgc (not (or sparc ppc x86 x86-64)))"
+          ":GENCGC not supported on selected architecture")
+         ("(not (or gencgc cheneygc))"
+          "One of :GENCGC or :CHENEYGC must be enabled")
+         ("(and win32 (not (and sb-thread
+                                sb-safepoint sb-thruption sb-wtimer
+                                sb-dynamic-core)))"
+          ":SB-WIN32 requires :SB-THREAD and related features")
+         ("(and sb-dynamic-core (not (and linkage-table sb-thread)))"
+          ;; Subtle memory corruption follows when sb-dynamic-core is
+          ;; active, and non-threaded allocation routines have not been
+          ;; updated to take the additional indirection into account.
+          ;; Let's avoid this unusual combination.
+          ":SB-DYNAMIC-CORE requires :LINKAGE-TABLE and :SB-THREAD")
+         ("(or (and alpha (or hppa mips ppc sparc x86 x86-64))
+               (and hppa (or mips ppc sparc x86 x86-64))
+               (and mips (or ppc sparc x86 x86-64))
+               (and ppc (or sparc x86 x86-64))
+               (and sparc (or x86 x86-64))
+               (and x86 x86-64))"
+          "More than one architecture selected")))
+      (failed-test-descriptions nil))
+  (dolist (test feature-compatability-tests)
+    (let ((*features* *shebang-features*))
+      (when (read-from-string (concatenate 'string "#+" (first test) "T NIL"))
+        (push (second test) failed-test-descriptions))))
+  (when failed-test-descriptions
+    (error "Feature compatibility check failed, ~S"
+           failed-test-descriptions)))
 
 ;;;; cold-init-related PACKAGE and SYMBOL tools
 
@@ -242,7 +267,14 @@
   (multiple-value-bind
         (obj-prefix obj-suffix)
       (ecase mode
-        (:host-compile (values *host-obj-prefix* *host-obj-suffix*))
+        (:host-compile
+         ;; On some xc hosts, it's impossible to LOAD a fasl file unless it
+         ;; has the same extension that the host uses for COMPILE-FILE
+         ;; output, so we have to be careful to use the xc host's preferred
+         ;; extension.
+         (values *host-obj-prefix*
+                 (concatenate 'string "."
+                              (pathname-type (compile-file-pathname stem)))))
         (:target-compile (values *target-obj-prefix*
                                  (if (find :assem flags)
                                      *target-assem-obj-suffix*
@@ -356,8 +388,8 @@
          (multiple-value-bind (output-truename warnings-p failure-p)
             (if trace-file
                 (funcall compile-file src :output-file tmp-obj
-                         :trace-file t)
-                (funcall compile-file src :output-file tmp-obj ))
+                         :trace-file t :allow-other-keys t)
+                (funcall compile-file src :output-file tmp-obj))
            (declare (ignore warnings-p))
            (cond ((not output-truename)
                   (error "couldn't compile ~S" src))
@@ -416,7 +448,6 @@
 
 ;;; like HOST-CLOAD-STEM, except that we don't bother to compile
 (defun host-load-stem (stem flags)
-  (declare (ignore flags)) ; (It's only relevant when compiling.)
   (load (stem-object-path stem flags :host-compile)))
 (compile 'host-load-stem)