X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=3f1bc3fa652cfdc8faf728d1039ccd3c2f090303;hb=40bea2551744d3cdc05a79a923fbff79a5755845;hp=fcdd9f941cb69998106c34a5b84b8f35513e282f;hpb=ddff81699041badddbf6dc6f31b4c9eec8cb5f44;p=sbcl.git diff --git a/make-config.sh b/make-config.sh index fcdd9f9..3f1bc3f 100644 --- a/make-config.sh +++ b/make-config.sh @@ -17,6 +17,187 @@ set -e # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. +print_help="no" + +# The classic form here was to use --userinit $DEVNULL --sysinit +# $DEVNULL, but that doesn't work on Win32 because SBCL doesn't handle +# device names properly. We still need $DEVNULL to be NUL on Win32 +# because it's used elsewhere (such as canonicalize-whitespace), so we +# need an alternate solution for the init file overrides. --no-foos +# have now been available long enough that this should not stop anyone +# from building. +if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] +then + SBCL_PREFIX="$PROGRAMFILES/sbcl" +else + SBCL_PREFIX="/usr/local" +fi +SBCL_XC_HOST="sbcl --disable-debugger --no-userinit --no-sysinit" +export SBCL_XC_HOST + +# Parse command-line options. +bad_option() { + echo $1 + echo "Enter \"$0 --help\" for list of valid options." + exit 1 +} + +some_options=false +for option +do + optarg_ok=true + # Split --foo=bar into --foo and bar. + case $option in + *=*) + # For ease of scripting treat skip valued options with empty + # values. + optarg=`expr "X$option" : '[^=]*=\(.*\)'` || optarg_ok=false + option=`expr "X$option" : 'X\([^=]*=\).*'` + ;; + *) + optarg="" + ;; + esac + + case $option in + --help | -help | -h) + print_help="yes" ;; + --prefix=) + $optarg_ok && SBCL_PREFIX=$optarg + ;; + --xc-host=) + $optarg_ok && SBCL_XC_HOST=$optarg + ;; + --dynamic-space-size=) + $optarg_ok && SBCL_DYNAMIC_SPACE_SIZE=$optarg + ;; + -*) + bad_option "Unknown command-line option to $0: \"$option\"" + ;; + *) + if $some_options + then + bad_option "Unknown command-line option to $0: \"$option\"" + else + legacy_xc_spec=$option + fi + ;; + esac + some_options=true +done + +# Previously XC host was provided as a positional argument. +if test -n "$legacy_xc_spec" +then + SBCL_XC_HOST="$legacy_xc_spec" +fi + +if test "$print_help" = "yes" +then + cat < Specify the install location. + + Script install.sh installs SBCL under the specified prefix + path: runtime as prefix/bin/sbcl, additional files under + prefix/lib/sbcl, and documentation under prefix/share. + + This option also affects the binaries: built-in default for + SBCL_HOME is: prefix/lib/sbcl/ + + Default prefix is: /usr/local + + --dynamic-space-size= Default dynamic-space size for target. + + This specifies the default dynamic-space size for the SBCL + being built. If you need to control the dynamic-space size + of the host SBCL, use the --xc-host option. + + If not provided, the default is platform-specific. is + taken to be megabytes unless explicitly suffixed with Gb in + order to specify the size in gigabytes. + + --xc-host= Specify the Common Lisp compilation host. + + The string provided should be a command to invoke the + cross-compilation Lisp system in such a way, that it reads + commands from standard input, and terminates when it reaches end + of file on standard input. + + Examples: + + "sbcl --disable-debugger --no-sysinit --no-userinit" + Use an existing SBCL binary as a cross-compilation + host even though you have stuff in your + initialization files which makes it behave in such a + non-standard way that it keeps the build from + working. Also disable the debugger instead of + waiting endlessly for a programmer to help it out + with input on *DEBUG-IO*. (This is the default.) + + "sbcl" + Use an existing SBCL binary as a cross-compilation + host, including your initialization files and + building with the debugger enabled. Not recommended + for casual users. + + "lisp -noinit -batch" + Use an existing CMU CL binary as a cross-compilation + host when you have weird things in your .cmucl-init + file. +EOF + exit 1 +fi + +mkdir -p output +# Save prefix for make and install.sh. +echo "SBCL_PREFIX='$SBCL_PREFIX'" > output/prefix.def +echo "$SBCL_DYNAMIC_SPACE_SIZE" > output/dynamic-space-size.txt + +# FIXME: Tweak this script, and the rest of the system, to support +# a second bootstrapping pass in which the cross-compilation host is +# known to be SBCL itself, so that the cross-compiler can do some +# optimizations (especially specializable arrays) that it doesn't +# know how to implement how in a portable way. (Or maybe that wouldn't +# require a second pass, just testing at build-the-cross-compiler time +# whether the cross-compilation host returns suitable values from +# UPGRADED-ARRAY-ELEMENT-TYPE?) + +if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then + DEVNULL=NUL +else + DEVNULL=/dev/null +fi +export DEVNULL + +. ./find-gnumake.sh +find_gnumake + +. ./generate-version.sh +generate_version + +# Now that we've done our option parsing and found various +# dependencies, write them out to a file to be sourced by other +# scripts. + +echo "DEVNULL=\"$DEVNULL\"; export DEVNULL" > output/build-config +echo "GNUMAKE=\"$GNUMAKE\"; export GNUMAKE" >> output/build-config +echo "SBCL_XC_HOST=\"$SBCL_XC_HOST\"; export SBCL_XC_HOST" >> output/build-config +echo "legacy_xc_spec=\"$legacy_xc_spec\"; export legacy_xc_spec" >> output/build-config + +# And now, sorting out the per-target dependencies... + case `uname` in Linux) sbcl_os="linux" @@ -174,7 +355,7 @@ case "$sbcl_os" in printf ' :largefile' >> $ltf ;; x86 | x86-64) - printf ' :sb-thread :largefile' >> $ltf + printf ' :sb-thread :sb-futex :largefile' >> $ltf ;; esac @@ -239,10 +420,10 @@ case "$sbcl_os" in printf ' :bsd' >> $ltf printf ' :darwin' >> $ltf if [ $sbcl_arch = "x86" ]; then - printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls :ud2-breakpoints' >> $ltf + printf ' :mach-exception-handler :restore-fs-segment-register-from-tls :ud2-breakpoints' >> $ltf fi if [ $sbcl_arch = "x86-64" ]; then - printf ' :mach-exception-handler :sb-lutex :ud2-breakpoints' >> $ltf + printf ' :mach-exception-handler :ud2-breakpoints' >> $ltf fi link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h link_or_copy bsd-os.h target-os.h @@ -252,8 +433,8 @@ case "$sbcl_os" in printf ' :unix' >> $ltf printf ' :elf' >> $ltf printf ' :sunos' >> $ltf - if [ $sbcl_arch = "x86" ] || [ $sbcl_arch = "amd64" ]; then - printf ' :sb-lutex' >> $ltf + if [ $sbcl_arch = "x86-64" ]; then + printf ' :largefile' >> $ltf fi link_or_copy Config.$sbcl_arch-sunos Config link_or_copy $sbcl_arch-sunos-os.h target-arch-os.h @@ -300,7 +481,7 @@ if [ "$sbcl_arch" = "x86" ]; then printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf printf ' :alien-callbacks :cycle-counter :inline-constants ' >> $ltf - printf ' :memory-barrier-vops' >> $ltf + printf ' :memory-barrier-vops :multiply-high-vops' >> $ltf case "$sbcl_os" in linux | freebsd | netbsd | openbsd | sunos | darwin | win32) printf ' :linkage-table' >> $ltf @@ -321,6 +502,7 @@ elif [ "$sbcl_arch" = "x86-64" ]; then printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf printf ' :alien-callbacks :cycle-counter :complex-float-vops' >> $ltf printf ' :float-eql-vops :inline-constants :memory-barrier-vops' >> $ltf + printf ' :multiply-high-vops' >> $ltf elif [ "$sbcl_arch" = "mips" ]; then printf ' :linkage-table' >> $ltf printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf @@ -335,7 +517,7 @@ elif [ "$sbcl_arch" = "mips" ]; then elif [ "$sbcl_arch" = "ppc" ]; then printf ' :gencgc :stack-allocatable-closures :stack-allocatable-lists' >> $ltf printf ' :linkage-table :raw-instance-init-vops :memory-barrier-vops' >> $ltf - printf ' :compare-and-swap-vops' >> $ltf + printf ' :compare-and-swap-vops :multiply-high-vops' >> $ltf if [ "$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