0.9.1.52:

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index c1d49be..ff5abee 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
@@ -58,7 +59,7 @@ printf ":%s" "$sbcl_arch" >> $ltf
 for d in src/compiler src/assembly; do
     echo //setting up symlink $d/target
     original_dir=`pwd`
-    cd $d
+    cd ./$d
     if [ -h target ] ; then
        rm target
     elif [ -w target ] ; then
@@ -85,7 +86,7 @@ ln -s ../assembly src/compiler/assembly
 
 echo //setting up OS-dependent information
 original_dir=`pwd`
-cd src/runtime/
+cd ./src/runtime/
 rm -f Config target-arch-os.h target-arch.h target-os.h target-lispregs.h
 # KLUDGE: these two logically belong in the previous section
 # ("architecture-dependent"); it seems silly to enforce this in terms
@@ -94,13 +95,14 @@ ln -s $sbcl_arch-arch.h target-arch.h
 ln -s $sbcl_arch-lispregs.h target-lispregs.h
 case `uname` in 
     Linux)
+       printf ' :elf' >> $ltf
        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
        ;;
@@ -108,6 +110,7 @@ case `uname` in
         # it's changed name twice since it was called OSF/1: clearly
         # the marketers forgot to tell the engineers about Digital Unix
         # _or_ OSF/1 ...
+       printf ' :elf' >> $ltf
        printf ' :osf1' >> $ltf
        sbcl_os="osf1"
         ln -s Config.$sbcl_arch-osf1 Config
@@ -120,17 +123,21 @@ case `uname` in
        ln -s bsd-os.h target-os.h
        case `uname` in
            FreeBSD)
+               printf ' :elf' >> $ltf
                printf ' :freebsd' >> $ltf
                sbcl_os="freebsd"
                ln -s Config.$sbcl_arch-freebsd Config
                ;;
            OpenBSD)
+               printf ' :elf' >> $ltf
                printf ' :openbsd' >> $ltf
                sbcl_os="openbsd"
                ln -s Config.$sbcl_arch-openbsd Config
                ;;
            NetBSD)
                 printf ' :netbsd' >> $ltf
+               printf ' :elf' >> $ltf
+               sbcl_os="netbsd"
                ln -s Config.$sbcl_arch-netbsd Config
                ;;
            *)
@@ -140,6 +147,7 @@ case `uname` in
        esac
        ;;
     Darwin)
+       printf ' :mach-o' >> $ltf
        printf ' :bsd' >> $ltf
        sbcl_os="darwin"
        ln -s $sbcl_arch-darwin-os.h target-arch-os.h
@@ -148,6 +156,7 @@ case `uname` in
        ln -s Config.$sbcl_arch-darwin Config
        ;;
     SunOS)
+       printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
        sbcl_os="sunos"
        ln -s Config.$sbcl_arch-sunos Config
@@ -185,9 +194,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
-    if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ]; then
+    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!
@@ -205,7 +217,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
@@ -219,9 +231,11 @@ elif [ "$sbcl_arch" = "sparc" ]; then
     # FUNCDEF macro for assembler. No harm in running this on sparc-linux 
     # as well.
     sh tools-for-build/sparc-funcdef.sh > src/runtime/sparc-funcdef.h
-    if [ "$sbcl_os" = "sunos" ]; then
+    if [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "linux" ]; then
        printf ' :linkage-table' >> $ltf
     fi
+elif [ "$sbcl_arch" = "alpha" ]; then
+    printf ' :stack-allocatable-closures' >> $ltf
 else
     # Nothing need be done in this case, but sh syntax wants a placeholder.
     echo > /dev/null