X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make-config.sh;h=6075913435d37c013d95b623c7ce2f3d73c82c24;hb=1f03c7f326823245708a84af86b31ac72bdb1742;hp=468c79f3cfbcde667e38c31b34d92fcb54931359;hpb=a157ed0be79751f85b8243c06102eea95af06aa3;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 468c79f..6075913 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -128,6 +128,11 @@ if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; then
     guessed_sbcl_arch=x86-64
 fi
 
+# Under Darwin, uname -m returns "i386" even if CPU is x86_64.
+if [ "$sbcl_os" = "darwin" ] && [ "`sysctl -n hw.optional.x86_64`" = "1" ]; then
+    guessed_sbcl_arch=x86-64
+fi
+
 echo //setting up CPU-architecture-dependent information
 sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch}
 echo sbcl_arch=\"$sbcl_arch\"
@@ -155,9 +160,12 @@ case "$sbcl_os" in
         # If you add other platforms here, don't forget to edit
         # src/runtime/Config.foo-linux too.
         case "$sbcl_arch" in
-        x86 | mips)
-            printf ' :largefile' >> $ltf
-            ;;
+	    mips)
+		printf ' :largefile' >> $ltf
+		;;
+            x86 | x86-64)
+		printf ' :sb-thread :largefile' >> $ltf
+		;;
         esac
 
         if [ $sbcl_arch = "x86-64" ]; then
@@ -281,7 +289,7 @@ if [ "$sbcl_arch" = "x86" ]; then
     printf ' :compare-and-swap-vops :unwind-to-frame-and-call-vop :raw-instance-init-vops' >> $ltf
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf
     printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf
-    printf ' :alien-callbacks :cycle-counter' >> $ltf
+    printf ' :alien-callbacks :cycle-counter :inline-constants ' >> $ltf
     case "$sbcl_os" in
     linux | freebsd | netbsd | openbsd | sunos | darwin | win32)
         printf ' :linkage-table' >> $ltf
@@ -297,6 +305,7 @@ elif [ "$sbcl_arch" = "x86-64" ]; then
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf
     printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf
     printf ' :alien-callbacks :cycle-counter :complex-float-vops' >> $ltf
+    printf ' :float-eql-vops :inline-constants ' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :linkage-table' >> $ltf
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf