X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=e5fbade2c4c050b84a3f628982c76870efb3b637;hb=17532463fa19f2fc2aba53b65c32e200a27ccd6a;hp=7664551dc5b5c4ef669ee72e9f8a27281e92b436;hpb=146f785ee2ee14077b815fd3cb17454774b04379;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 7664551..e5fbade 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
@@ -16,10 +17,75 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-echo //entering make-config.sh
+case `uname` in
+    Linux)
+        sbcl_os="linux"
+        ;;
+    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 ...
+        sbcl_os="osf1"
+        ;;
+    *BSD)
+        case `uname` in
+            FreeBSD)
+                sbcl_os="freebsd"
+                ;;
+            OpenBSD)
+                sbcl_os="openbsd"
+                ;;
+            NetBSD)
+                sbcl_os="netbsd"
+                ;;
+            *)
+                echo unsupported BSD variant: `uname`
+                exit 1
+                ;;
+        esac
+        ;;
+    Darwin)
+        sbcl_os="darwin"
+        ;;
+    SunOS)
+        sbcl_os="sunos"
+        ;;
+    CYGWIN* | WindowsNT | MINGW*)
+        sbcl_os="win32"
+        ;;
+    *)
+        echo unsupported OS type: `uname`
+        exit 1
+        ;;
+esac
 
-echo //checking that we are not root
-if [ `id -u` -eq 0 ] ; then echo 'Argh! we are (fake)root!'; exit 1; fi;
+link_or_copy() {
+   if [ "$sbcl_os" = "win32" ] ; then
+       cp -r "$1" "$2"
+   else
+        ln -s "$1" "$2"
+   fi
+}
+
+remove_dir_safely() {
+   if [ "$sbcl_os" = "win32" ] ; then
+        if [ -d "$1" ] ; then
+            rm -rf "$1"
+        elif [ -e "$1" ] ; then
+            echo "I'm afraid to remove non-directory $1."
+            exit 1
+        fi
+    else
+        if [ -h "$1" ] ; then
+            rm "$1"
+        elif [ -w "$1" ] ; then
+            echo "I'm afraid to replace non-symlink $1 with a symlink."
+            exit 1
+        fi
+    fi
+}
+
+echo //entering make-config.sh
 
 echo //ensuring the existence of output/ directory
 if [ ! -d output ] ; then mkdir output; fi
@@ -32,21 +98,25 @@ echo ';;;; See make-config.sh.' >> $ltf
 printf '(' >> $ltf
 
 echo //guessing default target CPU architecture from host architecture
-case `uname -m` in 
-    *86|x86_64) guessed_sbcl_arch=x86 ;; 
+case `uname -m` in
+    *86) guessed_sbcl_arch=x86 ;;
+    i86pc) guessed_sbcl_arch=x86 ;;
+    *x86_64) guessed_sbcl_arch=x86-64 ;;
+    amd64) 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 ;;
+    *ppc) guessed_sbcl_arch=ppc ;;
+    ppc64) 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
-	# target architecture will be specified explicitly below.
-	guessed_sbcl_arch=''
-	;;
+        # we have no guess, but it's not an error yet, since maybe
+        # target architecture will be specified explicitly below.
+        guessed_sbcl_arch=''
+        ;;
 esac
 
 echo //setting up CPU-architecture-dependent information
@@ -56,110 +126,142 @@ if [ "$sbcl_arch" = "" ] ; then
     echo "can't guess target SBCL architecture, need SBCL_ARCH environment var"
     exit 1
 fi
-printf ":%s" "$sbcl_arch" >> $ltf 
+printf ":%s" "$sbcl_arch" >> $ltf
 
 for d in src/compiler src/assembly; do
     echo //setting up symlink $d/target
     original_dir=`pwd`
-    cd $d
-    if [ -h target ] ; then
-	rm target
-    elif [ -w target ] ; then
-	echo "I'm afraid to replace non-symlink $d/target with a symlink."
-	exit 1
-    fi
+    remove_dir_safely "$d/target"
+    cd ./$d
     if [ -d $sbcl_arch ] ; then
-	ln -s $sbcl_arch target
+        link_or_copy $sbcl_arch target
     else
-	echo "missing sbcl_arch directory $PWD/$sbcl_arch"
-	exit 1
+        echo "missing sbcl_arch directory $PWD/$sbcl_arch"
+        exit 1
     fi
     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
+remove_dir_safely src/compiler/assembly
+original_dir=`pwd`
+cd src/compiler
+link_or_copy ../assembly assembly
+cd $original_dir
 
 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
 # of the shell script, though. -- CSR, 2002-02-03
-ln -s $sbcl_arch-arch.h target-arch.h
-ln -s $sbcl_arch-lispregs.h target-lispregs.h
-case `uname` in 
-    Linux)
-	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
-	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
-	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
-	;;
-    *BSD)
-	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)
-		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
-		;;
-	    *)
-		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)
+link_or_copy $sbcl_arch-arch.h target-arch.h
+link_or_copy $sbcl_arch-lispregs.h target-lispregs.h
+case "$sbcl_os" in
+    linux)
+        printf ' :elf' >> $ltf
+        printf ' :linux' >> $ltf
+
+        # If you add other platforms here, don't forget to edit
+        # src/runtime/Config.foo-linux too.
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :largefile' >> $ltf
+        fi
+
+        if [ $sbcl_arch = "x86-64" ]; then
+            link_or_copy Config.x86_64-linux Config
+        else
+            link_or_copy Config.$sbcl_arch-linux Config
+        fi
+        link_or_copy $sbcl_arch-linux-os.h target-arch-os.h
+        link_or_copy linux-os.h target-os.h
+        ;;
+    osf1)
+        printf ' :elf' >> $ltf
+        printf ' :osf1' >> $ltf
+        link_or_copy Config.$sbcl_arch-osf1 Config
+        link_or_copy $sbcl_arch-osf1-os.h target-arch-os.h
+        link_or_copy osf1-os.h target-os.h
+        ;;
+    *bsd)
+        printf ' :bsd' >> $ltf
+        link_or_copy $sbcl_arch-bsd-os.h target-arch-os.h
+        link_or_copy bsd-os.h target-os.h
+        case "$sbcl_os" in
+            freebsd)
+                printf ' :elf' >> $ltf
+                printf ' :freebsd' >> $ltf
+                printf ' :sb-pthread-futex' >> $ltf
+                if [ $sbcl_arch = "x86" ]; then
+                    printf ' :restore-tls-segment-register-from-tls' >> $ltf
+                fi
+                link_or_copy Config.$sbcl_arch-freebsd Config
+                ;;
+            openbsd)
+                printf ' :elf' >> $ltf
+                printf ' :openbsd' >> $ltf
+                link_or_copy Config.$sbcl_arch-openbsd Config
+                ;;
+            netbsd)
+                printf ' :netbsd' >> $ltf
+                printf ' :elf' >> $ltf
+                link_or_copy Config.$sbcl_arch-netbsd Config
+                ;;
+            *)
+                echo unsupported BSD variant: `uname`
+                exit 1
+                ;;
+        esac
+        ;;
+    darwin)
+        printf ' :mach-o' >> $ltf
+        printf ' :bsd' >> $ltf
+        printf ' :darwin' >> $ltf
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :sb-lutex :restore-fs-segment-register-from-tls' >> $ltf
+        fi
+        link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
+        link_or_copy bsd-os.h target-os.h
+        link_or_copy 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
-	;;
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :sb-lutex' >> $ltf
+        fi
+        link_or_copy Config.$sbcl_arch-sunos Config
+        link_or_copy $sbcl_arch-sunos-os.h target-arch-os.h
+        link_or_copy sunos-os.h target-os.h
+        ;;
+    win32)
+        printf ' :win32' >> $ltf
+        link_or_copy Config.$sbcl_arch-win32 Config
+        link_or_copy $sbcl_arch-win32-os.h target-arch-os.h
+        link_or_copy win32-os.h target-os.h
+        ;;
     *)
-	echo unsupported OS type: `uname`
-	exit 1
-	;;
+        echo unsupported OS type: `uname`
+        exit 1
+        ;;
 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
@@ -168,20 +270,42 @@ cd $original_dir
 # 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
+if [ "$sbcl_arch" = "x86" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
-elif [ "$sbcl_arch" = "mips" ] ; then
+    printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
+    if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "darwin" ] || [ "$sbcl_os" = "win32" ]; then
+        printf ' :linkage-table' >> $ltf
+    fi
+    if [ "$sbcl_os" = "win32" ]; then
+        # of course it doesn't provide dlopen, but there is
+        # roughly-equivalent magic nevertheless.
+        printf ' :os-provides-dlopen' >> $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!
-    $GNUMAKE -C tools-for-build determine-endianness
+    #
+    # 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
-    $GNUMAKE -C tools-for-build where-is-mcontext
-    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
+    #
+    # FIXME: integrate to grovel-features., maypahps
+    printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf
+    $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime
+    tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || (echo "error running where-is-mcontext"; exit 1)
 elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
+    printf ' :gencgc :stack-allocatable-closures' >> $ltf
+    # We provide a dlopen shim, so a little lie won't hurt
+    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
@@ -189,17 +313,28 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
         echo "See the limit(1) or ulimit(1) commands and the README file."
         exit 1
     fi
+elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "netbsd" ]; then
+    printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf
 elif [ "$sbcl_arch" = "sparc" ]; then
-    # Test the compiler in order to see if we are building on Sun 
+    # 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 
+    # 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
 
@@ -213,5 +348,8 @@ echo ')' >> $ltf
 
 # 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
-
+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