1.0.16.35: improved TIME output

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index 605b352..7c6997d 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -139,7 +139,7 @@ for d in src/compiler src/assembly; do
         echo "missing sbcl_arch directory $PWD/$sbcl_arch"
         exit 1
     fi
-    cd $original_dir
+    cd "$original_dir"
 done
 
 echo //setting up symlink src/compiler/assembly
@@ -147,7 +147,7 @@ remove_dir_safely src/compiler/assembly
 original_dir=`pwd`
 cd src/compiler
 link_or_copy ../assembly assembly
-cd $original_dir
+cd "$original_dir"
 
 echo //setting up OS-dependent information
 original_dir=`pwd`
@@ -197,9 +197,9 @@ case "$sbcl_os" in
             freebsd)
                 printf ' :elf' >> $ltf
                 printf ' :freebsd' >> $ltf
-                printf ' :sb-pthread-futex' >> $ltf
+                printf ' :gcc-tls' >> $ltf
                 if [ $sbcl_arch = "x86" ]; then
-                    printf ' :restore-tls-segment-register-from-tls' >> $ltf
+                    printf ' :restore-tls-segment-register-from-context' >> $ltf
                 fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
@@ -256,7 +256,7 @@ case "$sbcl_os" in
         exit 1
         ;;
 esac
-cd $original_dir
+cd "$original_dir"
 
 # FIXME: Things like :c-stack-grows-..., etc, should be
 # *derived-target-features* or equivalent, so that there was a nicer
@@ -283,10 +283,11 @@ cd $original_dir
 if [ "$sbcl_arch" = "x86" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
     printf ' :compare-and-swap-vops :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 ' :stack-allocatable-closures :alien-callbacks :cycle-counter' >> $ltf
+    case "$sbcl_os" in
+    linux | freebsd | netbsd | openbsd | sunos | darwin | win32)
         printf ' :linkage-table' >> $ltf
-    fi
+    esac
     if [ "$sbcl_os" = "win32" ]; then
         # of course it doesn't provide dlopen, but there is
         # roughly-equivalent magic nevertheless.
@@ -295,7 +296,7 @@ if [ "$sbcl_arch" = "x86" ]; then
 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-vops :unwind-to-frame-and-call-vop' >> $ltf
-    printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
+    printf ' :stack-allocatable-closures :alien-callbacks :cycle-counter' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :linkage-table' >> $ltf
     printf ' :stack-allocatable-closures' >> $ltf