1.0.9.14: Marginally improved VOPs, and a bit of code cleanup.

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index e5fbade..50d1714 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -63,7 +63,7 @@ link_or_copy() {
    if [ "$sbcl_os" = "win32" ] ; then
        cp -r "$1" "$2"
    else
-        ln -s "$1" "$2"
+       ln -s "$1" "$2"
    fi
 }
 
@@ -160,6 +160,7 @@ link_or_copy $sbcl_arch-arch.h target-arch.h
 link_or_copy $sbcl_arch-lispregs.h target-lispregs.h
 case "$sbcl_os" in
     linux)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :linux' >> $ltf
 
@@ -178,6 +179,7 @@ case "$sbcl_os" in
         link_or_copy linux-os.h target-os.h
         ;;
     osf1)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :osf1' >> $ltf
         link_or_copy Config.$sbcl_arch-osf1 Config
@@ -185,6 +187,7 @@ case "$sbcl_os" in
         link_or_copy osf1-os.h target-os.h
         ;;
     *bsd)
+        printf ' :unix' >> $ltf
         printf ' :bsd' >> $ltf
         link_or_copy $sbcl_arch-bsd-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
@@ -215,17 +218,22 @@ case "$sbcl_os" in
         esac
         ;;
     darwin)
+        printf ' :unix' >> $ltf
         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
+            printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls' >> $ltf
+        fi
+        if [ $sbcl_arch = "x86-64" ]; then
+            printf ' :mach-exception-handler :sb-lutex' >> $ltf
         fi
         link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
         link_or_copy Config.$sbcl_arch-darwin Config
         ;;
     sunos)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
         if [ $sbcl_arch = "x86" ]; then
@@ -272,6 +280,7 @@ cd $original_dir
 # similar with :STACK-GROWS-FOOWARD, too. -- WHN 2002-03-03
 if [ "$sbcl_arch" = "x86" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
+    printf ' :compare-and-swap-vop :unwind-to-frame-and-call-vop' >> $ltf
     printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
     if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "darwin" ] || [ "$sbcl_os" = "win32" ]; then
         printf ' :linkage-table' >> $ltf
@@ -283,6 +292,7 @@ if [ "$sbcl_arch" = "x86" ]; then
     fi
 elif [ "$sbcl_arch" = "x86-64" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table' >> $ltf
+    printf ' :compare-and-swap-vop :unwind-to-frame-and-call-vop' >> $ltf
     printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :linkage-table' >> $ltf