projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.4.60: More efficient structure raw slot accessors on x86-64
[sbcl.git]
/
make-config.sh
diff --git
a/make-config.sh
b/make-config.sh
index
c8e485b
..
01aa681
100644
(file)
--- a/
make-config.sh
+++ b/
make-config.sh
@@
-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 ;;
*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 ;;
[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 ;;
ppc64) guessed_sbcl_arch=ppc ;;
Power*Macintosh) guessed_sbcl_arch=ppc ;;
parisc) guessed_sbcl_arch=hppa ;;
@@
-161,6
+162,13
@@
case "$sbcl_os" in
linux)
printf ' :elf' >> $ltf
printf ' :linux' >> $ltf
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
if [ $sbcl_arch = "x86-64" ]; then
link_or_copy Config.x86_64-linux Config
else
@@
-184,6
+192,10
@@
case "$sbcl_os" in
freebsd)
printf ' :elf' >> $ltf
printf ' :freebsd' >> $ltf
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)
link_or_copy Config.$sbcl_arch-freebsd Config
;;
openbsd)
@@
-205,14
+217,23
@@
case "$sbcl_os" in
darwin)
printf ' :mach-o' >> $ltf
printf ' :bsd' >> $ltf
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
+ if [ $sbcl_arch = "x86-64" ]; then
+ printf ' :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
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 ' :elf' >> $ltf
printf ' :sunos' >> $ltf
link_or_copy Config.$sbcl_arch-darwin Config
;;
sunos)
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
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
@@
-255,7
+276,7
@@
cd $original_dir
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_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" ]; then
+ 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
printf ' :linkage-table' >> $ltf
fi
if [ "$sbcl_os" = "win32" ]; then
@@
-273,7
+294,7
@@
elif [ "$sbcl_arch" = "mips" ]; then
# cross-compilers!
#
# FIXME: integrate to grovel-features, mayhaps
# cross-compilers!
#
# FIXME: integrate to grovel-features, mayhaps
- $GNUMAKE -C tools-for-build determine-endianness -I src/runtime
+ $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,
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,
@@
-282,8
+303,8
@@
elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "linux" ]; then
#
# FIXME: integrate to grovel-features., maypahps
printf ' :gencgc :stack-allocatable-closures :linkage-table' >> $ltf
#
# 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
+ $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
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
@@
-295,6
+316,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
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
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