X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=9c2a5baa5c89ca39d9b8d81fab38a11e5b621b34;hb=a1007bcf38130a9a08e32f04a69e6836f76329d2;hp=89078337cbbcceecb67d4bbce9ad316d6cfac08d;hpb=aca45f35fc54bc29e2c79397e3538ff27f6e0db9;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 8907833..9c2a5ba 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -26,14 +26,17 @@ echo //initializing $ltf
 echo ';;;; This is a machine-generated file.' > $ltf
 echo ';;;; Please do not edit it by hand.' >> $ltf
 echo ';;;; See make-config.sh.' >> $ltf
-echo -n '(' >> $ltf
+printf '(' >> $ltf
 
 echo //guessing default target CPU architecture from host architecture
 case `uname -m` in 
     *86) 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 ;;
+    parisc) guessed_sbcl_arch=hppa ;;
+    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
@@ -49,7 +52,7 @@ if [ "$sbcl_arch" = "" ] ; then
     echo "can't guess target SBCL architecture, need SBCL_ARCH environment var"
     exit 1
 fi
-echo -n ":$sbcl_arch" >> $ltf 
+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
@@ -59,7 +62,13 @@ echo -n ":$sbcl_arch" >> $ltf
 # 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
-    echo -n ' :gencgc :stack-grows-downward-not-upward' >> $ltf
+    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
@@ -68,9 +77,9 @@ for d in src/compiler src/assembly; do
     echo //setting up symlink $d/target
     original_dir=`pwd`
     cd $d
-    if [ -L target ] ; then
+    if [ -h target ] ; then
 	rm target
-    elif [ -e target ] ; then
+    elif [ -w target ] ; then
 	echo "I'm afraid to replace non-symlink $d/target with a symlink."
 	exit 1
     fi
@@ -83,6 +92,15 @@ for d in src/compiler src/assembly; do
     cd $original_dir
 done
 
+echo //setting up symlink src/compiler/assembly
+if [ -h src/compiler/assembly ] ; then
+    rm src/compiler/assembly
+elif [ -w src/compiler/assembly ] ; then
+    echo "I'm afraid to replace non-symlink compiler/assembly with a symlink."
+    exit 1
+fi
+ln -s ../assembly src/compiler/assembly
+
 echo //setting up OS-dependent information
 original_dir=`pwd`
 cd src/runtime/
@@ -94,22 +112,31 @@ ln -s $sbcl_arch-arch.h target-arch.h
 ln -s $sbcl_arch-lispregs.h target-lispregs.h
 case `uname` in 
     Linux)
-	echo -n ' :linux' >> $ltf
+	printf ' :linux' >> $ltf
 	ln -s Config.$sbcl_arch-linux Config
 	ln -s $sbcl_arch-linux-os.h target-arch-os.h
 	ln -s linux-os.h target-os.h
 	;;
+    OSF1)			
+        # 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 ' :osf1' >> $ltf
+        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
+	;;
     *BSD)
-	echo -n ' :bsd' >> $ltf
+	printf ' :bsd' >> $ltf
 	ln -s $sbcl_arch-bsd-os.h target-arch-os.h
 	ln -s bsd-os.h target-os.h
 	case `uname` in
 	    FreeBSD)
-		echo -n ' :freebsd' >> $ltf
+		printf ' :freebsd' >> $ltf
 		ln -s Config.$sbcl_arch-freebsd Config
 		;;
 	    OpenBSD)
-		echo -n ' :openbsd' >> $ltf
+		printf ' :openbsd' >> $ltf
 		ln -s Config.$sbcl_arch-openbsd Config
 		;;
 	    *)
@@ -118,6 +145,12 @@ case `uname` in
 		;;
 	esac
 	;;
+    SunOS)
+        printf ' :sunos' >> $ltf
+	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
+	;;
     *)
 	echo unsupported OS type: `uname`
 	exit 1
@@ -135,3 +168,8 @@ echo ')' >> $ltf
 # cp base-version.txt $versionfile
 # echo " (built `date -u` by `whoami`@`hostname`)" >> $versionfile
 # echo 'This is a machine-generated file and should not be edited by hand.' >> $versionfile
+
+# Make a unique ID for this build (to discourage people from
+# mismatching sbcl and *.core files).
+echo '"'`hostname`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
+