X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=9cbfa0d1639d465c6fb1171c7ee7bd8c549e9830;hb=371577a214ce2659c271279ad48e4c42e1c0c93e;hp=fa4768e618de9832404a1f8cff0cfc772f114e2f;hpb=305c519d047b4d265a375cd930ce187db8385e5c;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index fa4768e..9cbfa0d 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -129,7 +129,7 @@ if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; then
 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
+if [ "$sbcl_os" = "darwin" ] && [ "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ]; then
     guessed_sbcl_arch=x86-64
 fi
 
@@ -143,6 +143,17 @@ fi
 printf ":%s" "$sbcl_arch" >> $ltf
 
 echo //setting up OS-dependent information
+
+# Under Darwin x86-64, guess whether Darwin 9+ or below.
+if [ "$sbcl_os" = "darwin" ] && [ "$sbcl_arch" = "x86-64" ]; then
+	darwin_version=`uname -r`
+	darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
+	if (( 8 < $darwin_version_major )); then
+		ver9_or_above="9+"
+		printf ' :inode64' >> $ltf
+	fi
+fi
+
 original_dir=`pwd`
 cd ./src/runtime/
 rm -f Config target-arch-os.h target-arch.h target-os.h target-lispregs.h
@@ -160,9 +171,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
@@ -226,14 +240,14 @@ case "$sbcl_os" in
         printf ' :bsd' >> $ltf
         printf ' :darwin' >> $ltf
         if [ $sbcl_arch = "x86" ]; then
-            printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls' >> $ltf
+            printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls :ud2-breakpoints' >> $ltf
         fi
         if [ $sbcl_arch = "x86-64" ]; then
-            printf ' :mach-exception-handler :sb-lutex' >> $ltf
+            printf ' :mach-exception-handler :sb-lutex :ud2-breakpoints' >> $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
+        link_or_copy Config.$sbcl_arch-darwin$ver9_or_above Config
         ;;
     sunos)
         printf ' :unix' >> $ltf
@@ -315,7 +329,7 @@ elif [ "$sbcl_arch" = "mips" ]; then
     $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime
     tools-for-build/determine-endianness >> $ltf
 elif [ "$sbcl_arch" = "ppc" ]; then
-    printf ' :gencgc :stack-allocatable-closures :stacka-allocatable-lists' >> $ltf
+    printf ' :gencgc :stack-allocatable-closures :stack-allocatable-lists' >> $ltf
     printf ' :linkage-table' >> $ltf
     if [ "$sbcl_os" = "linux" ]; then
         # Use a C program to detect which kind of glibc we're building on,