X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=0e570229dbf809b0bad5271cbc53498ef90cc40c;hb=22a6702974b7d6ff4e8f2b3b7b5ff446fc632de0;hp=d4feae3c5a0df9f8c38ad5f9888e71adaf706270;hpb=a58ade75b2b9d2f89779954c72613714025bb6e6;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index d4feae3..0e57022 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -184,6 +184,9 @@ case "$sbcl_os" in
             freebsd)
                 printf ' :elf' >> $ltf
                 printf ' :freebsd' >> $ltf
+                if [ $sbcl_arch = "x86" ]; then
+                    printf ' :sb-lutex :restore-tls-segment-register-from-tls' >> $ltf
+                fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
             openbsd)
@@ -205,14 +208,20 @@ case "$sbcl_os" in
     darwin)
         printf ' :mach-o' >> $ltf
         printf ' :bsd' >> $ltf
+        printf ' :darwin' >> $ltf
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :sb-lutex :restore-fs-segment-register-from-tls' >> $ltf
+        fi
         link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
-        printf ' :darwin' >> $ltf
         link_or_copy Config.$sbcl_arch-darwin Config
         ;;
     sunos)
         printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :sb-lutex' >> $ltf
+        fi
         link_or_copy Config.$sbcl_arch-sunos Config
         link_or_copy $sbcl_arch-sunos-os.h target-arch-os.h
         link_or_copy sunos-os.h target-os.h
@@ -255,7 +264,7 @@ cd $original_dir
 if [ "$sbcl_arch" = "x86" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
     printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
-    if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ]; then
+    if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "darwin" ] || [ "$sbcl_os" = "win32" ]; then
         printf ' :linkage-table' >> $ltf
     fi
     if [ "$sbcl_os" = "win32" ]; then
@@ -273,7 +282,7 @@ elif [ "$sbcl_arch" = "mips" ]; then
     # cross-compilers!
     #
     # FIXME: integrate to grovel-features, mayhaps
-    $GNUMAKE -C tools-for-build determine-endianness -I src/runtime
+    $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime
     tools-for-build/determine-endianness >> $ltf
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
     # Use a C program to detect which kind of glibc we're building on,
@@ -281,11 +290,11 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
     # versions 2.3.1 and 2.3.2
     #
     # FIXME: integrate to grovel-features., maypahps
-    printf ' :stack-allocatable-closures :linkage-table' >> $ltf
-    $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime
-    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
+    printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf
+    $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime
+    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || (echo "error running where-is-mcontext"; exit 1)
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
-    printf ' :stack-allocatable-closures' >> $ltf
+    printf ' :gencgc :stack-allocatable-closures' >> $ltf
     # We provide a dlopen shim, so a little lie won't hurt
     printf " :os-provides-dlopen :linkage-table :alien-callbacks" >> $ltf
     # The default stack ulimit under darwin is too small to run PURIFY.