X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=f26c251567a4ea2f83be81ea0191415caeeadf54;hb=db1814b928c9400194cb1dc6f57f42f2524501cc;hp=54e29823ec0ba1e63f8c09b4cfc0336fc1e1fea1;hpb=c5759c03562c984984e368c2ab85a21dceb719ab;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 54e2982..f26c251 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -30,11 +30,12 @@ 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 ;;
     ppc) guessed_sbcl_arch=ppc ;;
+    Power*Macintosh) guessed_sbcl_arch=ppc ;;
     parisc) guessed_sbcl_arch=hppa ;;
     mips) guessed_sbcl_arch=mips ;;
     *)
@@ -94,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
 	;;
@@ -103,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
@@ -114,20 +121,35 @@ 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
 		;;
+	    NetBSD)
+                printf ' :netbsd' >> $ltf
+		ln -s Config.$sbcl_arch-netbsd Config
+		;;
 	    *)
 		echo unsupported BSD variant: `uname`
 		exit 1
 		;;
 	esac
 	;;
+    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
+	ln -s Config.$sbcl_arch-darwin Config
+	;;
     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
@@ -154,11 +176,31 @@ 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
+elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
+    # 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
+        echo "Your stack size limit is too small to build SBCL."
+        echo "See the limit(1) or ulimit(1) commands and the README file."
+        exit 1
+    fi
+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
+    # 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
 else
     # Nothing need be done in this case, but sh syntax wants a placeholder.
     echo > /dev/null
 fi
-			    
+
 echo //finishing $ltf
 echo ')' >> $ltf