X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=6b720e0225fe2ee1148542bd0e72ad6d9a2a9a87;hb=bc5717f0d2edc7a6804491957da35ee0c686b592;hp=ca9e63fe87d8fefa0b522aded785b9be8c6edbfa;hpb=ec58ac28523a2e9a296e3f84ad0928ee04842eae;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index ca9e63f..6b720e0 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -208,6 +208,10 @@ EOF
   exit 1
 fi
 
+# Running make.sh with different options without clean.sh in the middle
+# can break things.
+sh clean.sh
+
 mkdir -p output
 # Save prefix for make and install.sh.
 echo "SBCL_PREFIX='$SBCL_PREFIX'" > output/prefix.def
@@ -478,7 +482,7 @@ case "$sbcl_os" in
                 printf ' :freebsd' >> $ltf
                 printf ' :gcc-tls' >> $ltf
                 if [ $sbcl_arch = "x86" ]; then
-                    printf ' :restore-tls-segment-register-from-context' >> $ltf
+                    printf ' :restore-fs-segment-register-from-tls' >> $ltf
                 fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
@@ -526,8 +530,22 @@ case "$sbcl_os" in
         ;;
     win32)
         printf ' :win32' >> $ltf
+        #
+        # Optional features -- We enable them by default, but the build
+        # ought to work perfectly without them:
+        #
         printf ' :sb-futex' >> $ltf
         printf ' :sb-qshow' >> $ltf
+        #
+        # Required features -- Some of these used to be optional, but
+        # building without them is no longer considered supported:
+        #
+        # (Of course it doesn't provide dlopen, but there is
+        # roughly-equivalent magic nevertheless:)
+        printf ' :sb-dynamic-core :os-provides-dlopen' >> $ltf
+        printf ' :sb-thread :sb-safepoint :sb-thruption :sb-wtimer' >> $ltf
+        printf ' :sb-safepoint-strictly' >> $ltf
+        #
         link_or_copy Config.$sbcl_arch-win32 Config
         link_or_copy $sbcl_arch-win32-os.h target-arch-os.h
         link_or_copy win32-os.h target-os.h
@@ -623,14 +641,14 @@ elif [ "$sbcl_arch" = "sparc" ]; then
     # FUNCDEF macro for assembler. No harm in running this on sparc-linux
     # as well.
     sh tools-for-build/sparc-funcdef.sh > src/runtime/sparc-funcdef.h
-    if [ "$sbcl_os" = "sunos" ]; then
+    if [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "linux" ]; then
         printf ' :gencgc' >> $ltf
     else
         echo '***'
-        echo '*** You are running SPARC on non-SunOS.  Since GENCGC is'
-        echo '*** untested on this combination, make-config.sh is falling'
-        echo '*** back to CHENEYGC.  Please consider adjusting parms.lisp'
-        echo '*** to build with GENCGC instead.'
+        echo '*** You are running SPARC on non-SunOS, non-Linux.  Since'
+        echo '*** GENCGC is untested on this combination, make-config.sh'
+        echo '*** is falling back to CHENEYGC.  Please consider adjusting'
+        echo '*** parms.lisp to build with GENCGC instead.'
         echo '***'
         printf ' :cheneygc' >> $ltf
     fi