projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.27.30: minor octets.lisp cleanup
[sbcl.git]
/
make-config.sh
diff --git
a/make-config.sh
b/make-config.sh
index
605b352
..
0554600
100644
(file)
--- a/
make-config.sh
+++ b/
make-config.sh
@@
-53,6
+53,9
@@
case `uname` in
CYGWIN* | WindowsNT | MINGW*)
sbcl_os="win32"
;;
CYGWIN* | WindowsNT | MINGW*)
sbcl_os="win32"
;;
+ HP-UX)
+ sbcl_os="hpux"
+ ;;
*)
echo unsupported OS type: `uname`
exit 1
*)
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 ;;
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
mips*) guessed_sbcl_arch=mips ;;
*)
# If we're not building on a supported target architecture, we
@@
-119,6
+123,11
@@
case `uname -m` in
;;
esac
;;
esac
+# Under Solaris, uname -m returns "i86pc" even if CPU is amd64.
+if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; then
+ guessed_sbcl_arch=x86-64
+fi
+
echo //setting up CPU-architecture-dependent information
sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch}
echo sbcl_arch=\"$sbcl_arch\"
echo //setting up CPU-architecture-dependent information
sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch}
echo sbcl_arch=\"$sbcl_arch\"
@@
-139,7
+148,7
@@
for d in src/compiler src/assembly; do
echo "missing sbcl_arch directory $PWD/$sbcl_arch"
exit 1
fi
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
done
echo //setting up symlink src/compiler/assembly
@@
-147,7
+156,7
@@
remove_dir_safely src/compiler/assembly
original_dir=`pwd`
cd src/compiler
link_or_copy ../assembly 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`
echo //setting up OS-dependent information
original_dir=`pwd`
@@
-188,6
+197,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
;;
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
*bsd)
printf ' :unix' >> $ltf
printf ' :bsd' >> $ltf
@@
-197,9
+214,9
@@
case "$sbcl_os" in
freebsd)
printf ' :elf' >> $ltf
printf ' :freebsd' >> $ltf
freebsd)
printf ' :elf' >> $ltf
printf ' :freebsd' >> $ltf
- printf ' :sb-pthread-futex' >> $ltf
+ printf ' :gcc-tls' >> $ltf
if [ $sbcl_arch = "x86" ]; then
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
;;
fi
link_or_copy Config.$sbcl_arch-freebsd Config
;;
@@
-238,7
+255,7
@@
case "$sbcl_os" in
printf ' :unix' >> $ltf
printf ' :elf' >> $ltf
printf ' :sunos' >> $ltf
printf ' :unix' >> $ltf
printf ' :elf' >> $ltf
printf ' :sunos' >> $ltf
- if [ $sbcl_arch = "x86" ]; then
+ if [ $sbcl_arch = "x86" ] || [ $sbcl_arch = "amd64" ]; then
printf ' :sb-lutex' >> $ltf
fi
link_or_copy Config.$sbcl_arch-sunos Config
printf ' :sb-lutex' >> $ltf
fi
link_or_copy Config.$sbcl_arch-sunos Config
@@
-256,7
+273,7
@@
case "$sbcl_os" in
exit 1
;;
esac
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
# FIXME: Things like :c-stack-grows-..., etc, should be
# *derived-target-features* or equivalent, so that there was a nicer
@@
-282,11
+299,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
# 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-vops :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
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.
if [ "$sbcl_os" = "win32" ]; then
# of course it doesn't provide dlopen, but there is
# roughly-equivalent magic nevertheless.
@@
-294,8
+312,8
@@
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
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-vops :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
elif [ "$sbcl_arch" = "mips" ]; then
printf ' :linkage-table' >> $ltf
printf ' :stack-allocatable-closures' >> $ltf