0.8.21.18:

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index e725cfe..09b059a 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -30,14 +30,15 @@ printf '(' >> $ltf
 
 echo //guessing default target CPU architecture from host architecture
 case `uname -m` in 
-    *86|x86_64) guessed_sbcl_arch=x86 ;; 
+    *86) guessed_sbcl_arch=x86 ;; 
+    *x86_64) 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 ;;
     Power*Macintosh) guessed_sbcl_arch=ppc ;;
     parisc) guessed_sbcl_arch=hppa ;;
-    mips) guessed_sbcl_arch=mips ;;
+    mips*) guessed_sbcl_arch=mips ;;
     *)
         # If we're not building on a supported target architecture, we
        # we have no guess, but it's not an error yet, since maybe
@@ -96,11 +97,11 @@ case `uname` in
     Linux)
        printf ' :linux' >> $ltf
        sbcl_os="linux"
-       if [ "`uname -m`" = "x86_64" ]; then
-           ln -s Config.x86_64-linux Config
-       else
-           ln -s Config.$sbcl_arch-linux Config
-       fi
+       if [ $sbcl_arch = "x86-64" ]; then
+           ln -s Config.x86_64-linux Config                                    
+       else                                                                    
+           ln -s Config.$sbcl_arch-linux Config                                
+       fi 
        ln -s $sbcl_arch-linux-os.h target-arch-os.h
        ln -s linux-os.h target-os.h
        ;;
@@ -186,9 +187,12 @@ 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 ' :stack-allocatable-closures' >> $ltf
     if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ]; then
        printf ' :linkage-table' >> $ltf
     fi
+elif [ "$sbcl_arch" = "x86-64" ]; then
+    printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     # Use a little C program to try to guess the endianness.  Ware
     # cross-compilers!
@@ -206,7 +210,7 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
     tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
     # We provide a dlopen shim, so a little lie won't hurt
-    printf " :os-provides-dlopen" >> $ltf
+    printf " :os-provides-dlopen :linkage-table" >> $ltf
     # The default stack ulimit under darwin is too small to run PURIFY.
     # Best we can do is complain and exit at this stage
     if [ "`ulimit -s`" = "512" ]; then