X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=131f6fe3da58aed7b55d6ce3d5079f647b7bcd10;hb=babd45f7788c2f50c9d6193c1c7108e0a6b3a547;hp=bcbe4811d7d3fb17768b606b782e8ea77d931198;hpb=f6f77e8d2a2f84b5d946aa485d1a18ba6f97cea3;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index bcbe481..131f6fe 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,12 +32,15 @@ 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 ;;
     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
@@ -53,30 +57,11 @@ if [ "$sbcl_arch" = "" ] ; then
     exit 1
 fi
 printf ":%s" "$sbcl_arch" >> $ltf 
-# KLUDGE: currently the x86 only works with the generational garbage
-# collector (indicated by the presence of :GENCGC in *FEATURES*) and
-# alpha, sparc and ppc with the stop'n'copy collector (indicated by
-# the absence of :GENCGC in *FEATURES*). This isn't a great
-# separation, but for now, rather than have :GENCGC in
-# base-target-features.lisp-expr, we add it into local-target-features
-# if we're building for x86. -- CSR, 2002-02-21 Then we do something
-# 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
-elif [ "$sbcl_arch" = "mips" ] ; then
-    # Use a little C program to try to guess the endianness.  Ware
-    # cross-compilers!
-    gnumake=${GNUMAKE:-gmake}
-    $gnumake -C tools-for-build determine-endianness
-    tools-for-build/determine-endianness >> $ltf
-else
-    # Nothing need be done in this case, but sh syntax wants a placeholder.
-    echo > /dev/null
-fi
+
 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
@@ -103,7 +88,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
@@ -112,8 +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
-	ln -s Config.$sbcl_arch-linux Config
+	sbcl_os="linux"
+	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
 	;;
@@ -121,7 +112,9 @@ 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
 	ln -s $sbcl_arch-osf1-os.h target-arch-os.h
 	ln -s osf1-os.h target-os.h
@@ -132,21 +125,42 @@ 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
+		;;
 	    *)
 		echo unsupported BSD variant: `uname`
 		exit 1
 		;;
 	esac
 	;;
+    Darwin)
+	printf ' :mach-o' >> $ltf
+	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 ' :elf' >> $ltf
         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
@@ -158,6 +172,84 @@ case `uname` in
 esac
 cd $original_dir
 
+# FIXME: Things like :c-stack-grows-..., etc, should be
+# *derived-target-features* or equivalent, so that there was a nicer
+# way to specify them then sprinkling them in this file. They should
+# still be tweakable by advanced users, though, but probably not
+# appear in *features* of target. #!+/- should be adjusted to take
+# them in account as well. At minimum the nicer specification stuff,
+# though:
+#
+# (define-feature :dlopen (features)
+#   (union '(:bsd :linux :darwin :sunos) features))
+#
+# (define-feature :c-stack-grows-downwards-not-upwards (features)
+#   (member :x86 features))
+
+# KLUDGE: currently the x86 only works with the generational garbage
+# collector (indicated by the presence of :GENCGC in *FEATURES*) and
+# alpha, sparc and ppc with the stop'n'copy collector (indicated by
+# the absence of :GENCGC in *FEATURES*). This isn't a great
+# separation, but for now, rather than have :GENCGC in
+# base-target-features.lisp-expr, we add it into local-target-features
+# if we're building for x86. -- CSR, 2002-02-21 Then we do something
+# 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" ] || [ "$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' >> $ltf
+elif [ "$sbcl_arch" = "mips" ]; then
+    # Use a little C program to try to guess the endianness.  Ware
+    # cross-compilers!
+    #
+    # FIXME: integrate to grovel-features, mayhaps
+    $GNUMAKE -C tools-for-build determine-endianness -I src/runtime
+    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
+    #
+    # 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
+    # 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
+    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
+fi
+
+export sbcl_os sbcl_arch
+sh tools-for-build/grovel-features.sh >> $ltf
+
 echo //finishing $ltf
 echo ')' >> $ltf
 
@@ -171,5 +263,8 @@ echo ')' >> $ltf
 
 # Make a unique ID for this build (to discourage people from
 # mismatching sbcl and *.core files).
-echo '"'`hostname -s`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
-
+if [ `uname` = "SunOS" ] ; then
+  # use /usr/xpg4/bin/id instead of /usr/bin/id
+  PATH=/usr/xpg4/bin:$PATH
+fi
+echo '"'`hostname`-`id -un`-`date +%Y-%m-%d-%H-%M-%S`'"' > output/build-id.tmp