X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fshared.lisp;h=479b426c90ce4870f377745555c101ee76c670fb;hb=09f925d42d072d74c6977cc52e3ebf36135d2e15;hp=910220697332fb1100c0d9fe48f8d6d0dd2cba59;hpb=69d1abb6b1d8c7ef7e0728e87d10853a1306b16e;p=sbcl.git

diff --git a/src/cold/shared.lisp b/src/cold/shared.lisp
index 9102206..479b426 100644
--- a/src/cold/shared.lisp
+++ b/src/cold/shared.lisp
@@ -153,10 +153,20 @@
           ":GENCGC and :CHENEYGC are incompatible")
          ("(and cheneygc (not (or alpha hppa mips ppc sparc)))"
           ":CHENEYGC not supported on selected architecture")
-         ("(and gencgc (not (or ppc x86 x86-64)))"
+         ("(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))
@@ -170,7 +180,7 @@
       (when (read-from-string (concatenate 'string "#+" (first test) "T NIL"))
         (push (second test) failed-test-descriptions))))
   (when failed-test-descriptions
-    (error "Feature compatability check failed, ~S"
+    (error "Feature compatibility check failed, ~S"
            failed-test-descriptions)))
 
 ;;;; cold-init-related PACKAGE and SYMBOL tools