X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make-config.sh;h=c05acab899b51066c5f38b8ba06e138e5252652a;hb=57bf8a7e65a81a8cff946a65e7e33e3f9b948ac6;hp=5f250ecb5acad625957f153fa3f94de99f0a0e04;hpb=572da92e86267052cd0944972374ed7d8e5b379e;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 5f250ec..c05acab 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -146,12 +146,11 @@ 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
+    darwin_version=`uname -r`
+    darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
+    if (( 8 < $darwin_version_major )); then
+	printf ' :inode64 :darwin9-or-better' >> $ltf
+    fi
 fi
 
 original_dir=`pwd`
@@ -240,14 +239,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$ver9_or_above Config
+        link_or_copy Config.$sbcl_arch-darwin Config
         ;;
     sunos)
         printf ' :unix' >> $ltf
@@ -301,6 +300,7 @@ if [ "$sbcl_arch" = "x86" ]; then
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf
     printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf
     printf ' :alien-callbacks :cycle-counter :inline-constants ' >> $ltf
+    printf ' :memory-barrier-vops' >> $ltf
     case "$sbcl_os" in
     linux | freebsd | netbsd | openbsd | sunos | darwin | win32)
         printf ' :linkage-table' >> $ltf
@@ -316,7 +316,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
+    printf ' :float-eql-vops :inline-constants :memory-barrier-vops' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :linkage-table' >> $ltf
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf
@@ -330,7 +330,8 @@ elif [ "$sbcl_arch" = "mips" ]; then
     tools-for-build/determine-endianness >> $ltf
 elif [ "$sbcl_arch" = "ppc" ]; then
     printf ' :gencgc :stack-allocatable-closures :stack-allocatable-lists' >> $ltf
-    printf ' :linkage-table' >> $ltf
+    printf ' :linkage-table :raw-instance-init-vops :memory-barrier-vops' >> $ltf
+    printf ' :compare-and-swap-vops' >> $ltf
     if [ "$sbcl_os" = "linux" ]; then
         # Use a C program to detect which kind of glibc we're building on,
         # to bandage across the break in source compatibility between