X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=7c6997dccdd4bd2a7d5585a7553fd3bdd23fc5b0;hb=9b1fade83db8453b75b8c7380eb12ce41b5b889c;hp=c925c5825b4f65912e983792dd54ae73810fdd25;hpb=44c608efa2e73df1c1ab7e259db405b9060c64a1;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index c925c58..7c6997d 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -63,7 +63,7 @@ link_or_copy() {
    if [ "$sbcl_os" = "win32" ] ; then
        cp -r "$1" "$2"
    else
-        ln -s "$1" "$2"
+       ln -s "$1" "$2"
    fi
 }
 
@@ -102,10 +102,11 @@ 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 ;;
@@ -138,7 +139,7 @@ for d in src/compiler src/assembly; do
         echo "missing sbcl_arch directory $PWD/$sbcl_arch"
         exit 1
     fi
-    cd $original_dir
+    cd "$original_dir"
 done
 
 echo //setting up symlink src/compiler/assembly
@@ -146,7 +147,7 @@ remove_dir_safely src/compiler/assembly
 original_dir=`pwd`
 cd src/compiler
 link_or_copy ../assembly assembly
-cd $original_dir
+cd "$original_dir"
 
 echo //setting up OS-dependent information
 original_dir=`pwd`
@@ -159,8 +160,18 @@ 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 ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :linux' >> $ltf
+
+        # If you add other platforms here, don't forget to edit
+        # src/runtime/Config.foo-linux too.
+        case "$sbcl_arch" in
+        x86 | mips)
+            printf ' :largefile' >> $ltf
+            ;;
+        esac
+
         if [ $sbcl_arch = "x86-64" ]; then
             link_or_copy Config.x86_64-linux Config
         else
@@ -170,6 +181,7 @@ case "$sbcl_os" in
         link_or_copy linux-os.h target-os.h
         ;;
     osf1)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :osf1' >> $ltf
         link_or_copy Config.$sbcl_arch-osf1 Config
@@ -177,6 +189,7 @@ case "$sbcl_os" in
         link_or_copy osf1-os.h target-os.h
         ;;
     *bsd)
+        printf ' :unix' >> $ltf
         printf ' :bsd' >> $ltf
         link_or_copy $sbcl_arch-bsd-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
@@ -184,6 +197,10 @@ case "$sbcl_os" in
             freebsd)
                 printf ' :elf' >> $ltf
                 printf ' :freebsd' >> $ltf
+                printf ' :gcc-tls' >> $ltf
+                if [ $sbcl_arch = "x86" ]; then
+                    printf ' :restore-tls-segment-register-from-context' >> $ltf
+                fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
             openbsd)
@@ -203,16 +220,27 @@ case "$sbcl_os" in
         esac
         ;;
     darwin)
+        printf ' :unix' >> $ltf
         printf ' :mach-o' >> $ltf
         printf ' :bsd' >> $ltf
+        printf ' :darwin' >> $ltf
+        if [ $sbcl_arch = "x86" ]; then
+            printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls' >> $ltf
+        fi
+        if [ $sbcl_arch = "x86-64" ]; then
+            printf ' :mach-exception-handler :sb-lutex' >> $ltf
+        fi
         link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
-        printf ' :darwin' >> $ltf
         link_or_copy Config.$sbcl_arch-darwin Config
         ;;
     sunos)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
+        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
@@ -228,7 +256,7 @@ case "$sbcl_os" in
         exit 1
         ;;
 esac
-cd $original_dir
+cd "$original_dir"
 
 # FIXME: Things like :c-stack-grows-..., etc, should be
 # *derived-target-features* or equivalent, so that there was a nicer
@@ -254,10 +282,12 @@ 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
-    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 ' :compare-and-swap-vops :unwind-to-frame-and-call-vop' >> $ltf
+    printf ' :stack-allocatable-closures :alien-callbacks :cycle-counter' >> $ltf
+    case "$sbcl_os" in
+    linux | freebsd | netbsd | openbsd | sunos | darwin | win32)
         printf ' :linkage-table' >> $ltf
-    fi
+    esac
     if [ "$sbcl_os" = "win32" ]; then
         # of course it doesn't provide dlopen, but there is
         # roughly-equivalent magic nevertheless.
@@ -265,10 +295,12 @@ if [ "$sbcl_arch" = "x86" ]; then
     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
+    printf ' :compare-and-swap-vops :unwind-to-frame-and-call-vop' >> $ltf
+    printf ' :stack-allocatable-closures :alien-callbacks :cycle-counter' >> $ltf
 elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :linkage-table' >> $ltf
     printf ' :stack-allocatable-closures' >> $ltf
+    printf ' :alien-callbacks' >> $ltf
     # Use a little C program to try to guess the endianness.  Ware
     # cross-compilers!
     #
@@ -280,7 +312,7 @@ elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
     # to bandage across the break in source compatibility between
     # versions 2.3.1 and 2.3.2
     #
-    # FIXME: integrate to grovel-features., maypahps
+    # FIXME: integrate to grovel-features, mayhaps
     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)
@@ -295,6 +327,8 @@ 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
     # toolchain as opposed to GNU binutils, and write the appropriate