X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=2a70efe8e502af3f426c4dcbfa39f80c1c4b91d9;hb=5cf3c4259d529e180d75d4d140f344e600d2b06b;hp=bacc7971a8f81e165cbca817910132e3d889d6ce;hpb=b2f01c86f388284405fa28405fe97898fe158c02;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index bacc797..2a70efe 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -53,6 +53,9 @@ case `uname` in
     CYGWIN* | WindowsNT | MINGW*)
         sbcl_os="win32"
         ;;
+    HP-UX)
+        sbcl_os="hpux"
+        ;;
     *)
         echo unsupported OS type: `uname`
         exit 1
@@ -110,6 +113,7 @@ case `uname -m` in
     ppc64) guessed_sbcl_arch=ppc ;;
     Power*Macintosh) guessed_sbcl_arch=ppc ;;
     parisc) guessed_sbcl_arch=hppa ;;
+    9000/800) guessed_sbcl_arch=hppa ;;
     mips*) guessed_sbcl_arch=mips ;;
     *)
         # If we're not building on a supported target architecture, we
@@ -139,7 +143,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
@@ -147,7 +151,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`
@@ -188,6 +192,14 @@ case "$sbcl_os" in
         link_or_copy $sbcl_arch-osf1-os.h target-arch-os.h
         link_or_copy osf1-os.h target-os.h
         ;;
+    hpux)
+        printf ' :unix' >> $ltf
+        printf ' :elf' >> $ltf
+        printf ' :hpux' >> $ltf
+        link_or_copy Config.$sbcl_arch-hpux Config
+        link_or_copy $sbcl_arch-hpux-os.h target-arch-os.h
+        link_or_copy hpux-os.h target-os.h
+        ;;
     *bsd)
         printf ' :unix' >> $ltf
         printf ' :bsd' >> $ltf
@@ -197,9 +209,9 @@ case "$sbcl_os" in
             freebsd)
                 printf ' :elf' >> $ltf
                 printf ' :freebsd' >> $ltf
-                printf ' :sb-pthread-futex' >> $ltf
+                printf ' :gcc-tls' >> $ltf
                 if [ $sbcl_arch = "x86" ]; then
-                    printf ' :restore-tls-segment-register-from-tls' >> $ltf
+                    printf ' :restore-tls-segment-register-from-context' >> $ltf
                 fi
                 link_or_copy Config.$sbcl_arch-freebsd Config
                 ;;
@@ -256,7 +268,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
@@ -282,11 +294,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 ' :compare-and-swap-vop :unwind-to-frame-and-call-vop' >> $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 :raw-instance-init-vops' >> $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.
@@ -294,11 +307,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 ' :compare-and-swap-vop :unwind-to-frame-and-call-vop' >> $ltf
-    printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
+    printf ' :compare-and-swap-vops :unwind-to-frame-and-call-vop :raw-instance-init-vops' >> $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!
     #
@@ -310,7 +324,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)