X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=bacc7971a8f81e165cbca817910132e3d889d6ce;hb=b2f01c86f388284405fa28405fe97898fe158c02;hp=911fa247651ea71f60bf9c01d454855a685a8f9d;hpb=46e428110e302636b345928f6f052b8a282c64fa;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 911fa24..bacc797 100644
--- 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
 }
 
@@ -102,10 +102,11 @@ case `uname -m` in
     *86) guessed_sbcl_arch=x86 ;;
     i86pc) guessed_sbcl_arch=x86 ;;
     *x86_64) guessed_sbcl_arch=x86-64 ;;
+    amd64) guessed_sbcl_arch=x86-64 ;;
     [Aa]lpha) guessed_sbcl_arch=alpha ;;
     sparc*) guessed_sbcl_arch=sparc ;;
     sun*) guessed_sbcl_arch=sparc ;;
-    ppc) guessed_sbcl_arch=ppc ;;
+    *ppc) guessed_sbcl_arch=ppc ;;
     ppc64) guessed_sbcl_arch=ppc ;;
     Power*Macintosh) guessed_sbcl_arch=ppc ;;
     parisc) guessed_sbcl_arch=hppa ;;
@@ -159,14 +160,17 @@ 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
 
         # If you add other platforms here, don't forget to edit
         # src/runtime/Config.foo-linux too.
-        if [ $sbcl_arch = "x86" ]; then
+        case "$sbcl_arch" in
+        x86 | mips)
             printf ' :largefile' >> $ltf
-        fi
+            ;;
+        esac
 
         if [ $sbcl_arch = "x86-64" ]; then
             link_or_copy Config.x86_64-linux Config
@@ -177,6 +181,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
@@ -184,6 +189,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
@@ -191,8 +197,9 @@ case "$sbcl_os" in
             freebsd)
                 printf ' :elf' >> $ltf
                 printf ' :freebsd' >> $ltf
+                printf ' :sb-pthread-futex' >> $ltf
                 if [ $sbcl_arch = "x86" ]; then
-                    printf ' :sb-lutex :restore-tls-segment-register-from-tls' >> $ltf
+                    printf ' :restore-tls-segment-register-from-tls' >> $ltf
                 fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
@@ -213,17 +220,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
@@ -270,6 +282,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
@@ -281,6 +294,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
@@ -311,6 +325,8 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
         echo "See the limit(1) or ulimit(1) commands and the README file."
         exit 1
     fi
+elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "netbsd" ]; then
+    printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf
 elif [ "$sbcl_arch" = "sparc" ]; then
     # Test the compiler in order to see if we are building on Sun
     # toolchain as opposed to GNU binutils, and write the appropriate