0.8.4.16

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index 625ec6f..438c969 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -30,7 +30,7 @@ printf '(' >> $ltf
 
 echo //guessing default target CPU architecture from host architecture
 case `uname -m` in 
-    *86) guessed_sbcl_arch=x86 ;; 
+    *86|x86_64) guessed_sbcl_arch=x86 ;; 
     [Aa]lpha) guessed_sbcl_arch=alpha ;;
     sparc*) guessed_sbcl_arch=sparc ;;
     sun*) guessed_sbcl_arch=sparc ;;
@@ -95,7 +95,12 @@ ln -s $sbcl_arch-lispregs.h target-lispregs.h
 case `uname` in 
     Linux)
        printf ' :linux' >> $ltf
-       ln -s Config.$sbcl_arch-linux Config
+       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
        ln -s $sbcl_arch-linux-os.h target-arch-os.h
        ln -s linux-os.h target-os.h
        ;;
@@ -104,6 +109,7 @@ case `uname` in
         # the marketers forgot to tell the engineers about Digital Unix
         # _or_ OSF/1 ...
        printf ' :osf1' >> $ltf
+       sbcl_os="osf1"
         ln -s Config.$sbcl_arch-osf1 Config
        ln -s $sbcl_arch-osf1-os.h target-arch-os.h
        ln -s osf1-os.h target-os.h
@@ -115,10 +121,12 @@ case `uname` in
        case `uname` in
            FreeBSD)
                printf ' :freebsd' >> $ltf
+               sbcl_os="freebsd"
                ln -s Config.$sbcl_arch-freebsd Config
                ;;
            OpenBSD)
                printf ' :openbsd' >> $ltf
+               sbcl_os="openbsd"
                ln -s Config.$sbcl_arch-openbsd Config
                ;;
            *)
@@ -129,6 +137,7 @@ case `uname` in
        ;;
     Darwin)
        printf ' :bsd' >> $ltf
+       sbcl_os="darwin"
        ln -s $sbcl_arch-darwin-os.h target-arch-os.h
        ln -s bsd-os.h target-os.h
        printf ' :darwin' >> $ltf
@@ -136,6 +145,7 @@ case `uname` in
        ;;
     SunOS)
         printf ' :sunos' >> $ltf
+       sbcl_os="sunos"
        ln -s Config.$sbcl_arch-sunos Config
        ln -s $sbcl_arch-sunos-os.h target-arch-os.h
        ln -s sunos-os.h target-os.h
@@ -162,6 +172,12 @@ elif [ "$sbcl_arch" = "mips" ] ; then
     # cross-compilers!
     $GNUMAKE -C tools-for-build determine-endianness
     tools-for-build/determine-endianness >> $ltf
+elif [ "$sbcl_arch" = "ppc" -a "$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
+    # versions 2.3.1 and 2.3.2
+    $GNUMAKE -C tools-for-build where-is-mcontext
+    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
 else
     # Nothing need be done in this case, but sh syntax wants a placeholder.
     echo > /dev/null