X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=7fc58f01b42c6327129dc9065fe1b0801a4a304e;hb=93be0089fe7b2a9e34bf1cb6da9fe6e902769f5e;hp=238bc8a4deab074bdc0335e78c1c30889e775190;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 238bc8a..7fc58f0 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # The make-config.sh script uses information about the target machine
 # to set things up for compilation. It's vaguely like a stripped-down
@@ -31,6 +32,7 @@ printf '(' >> $ltf
 echo //guessing default target CPU architecture from host architecture
 case `uname -m` in 
     *86) guessed_sbcl_arch=x86 ;; 
+    i86pc) guessed_sbcl_arch=x86 ;;
     *x86_64) guessed_sbcl_arch=x86-64 ;; 
     [Aa]lpha) guessed_sbcl_arch=alpha ;;
     sparc*) guessed_sbcl_arch=sparc ;;
@@ -38,7 +40,7 @@ case `uname -m` in
     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
@@ -95,13 +97,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
 	;;
@@ -109,6 +112,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
@@ -121,17 +125,20 @@ 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
 		;;
@@ -142,6 +149,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
@@ -150,6 +158,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
@@ -187,12 +196,16 @@ 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" ] || [ "$sbcl_os" = "netbsd" ]; then
+    printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
+    if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ]; 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
+    printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
+    printf ' :linkage-table' >> $ltf
+    printf ' :stack-allocatable-closures' >> $ltf
     # Use a little C program to try to guess the endianness.  Ware
     # cross-compilers!
     #
@@ -205,11 +218,13 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
     # versions 2.3.1 and 2.3.2
     #
     # FIXME: integrate to grovel-features., maypahps
+    printf ' :stack-allocatable-closures' >> $ltf
     $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime
     tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
+    printf ' :stack-allocatable-closures' >> $ltf
     # We provide a dlopen shim, so a little lie won't hurt
-    printf " :os-provides-dlopen :linkage-table" >> $ltf
+    printf " :os-provides-dlopen :linkage-table :alien-callbacks" >> $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
@@ -226,6 +241,9 @@ elif [ "$sbcl_arch" = "sparc" ]; then
     if [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "linux" ]; then
 	printf ' :linkage-table' >> $ltf
     fi
+    printf ' :stack-allocatable-closures' >> $ltf
+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
@@ -252,4 +270,3 @@ if [ `uname` = "SunOS" ] ; then
   PATH=/usr/xpg4/bin:$PATH
 fi
 echo '"'`hostname`-`id -un`-`date +%Y-%m-%d-%H-%M-%S`'"' > output/build-id.tmp
-