X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=f251797be89334b9746c3720bbf462377841f3b1;hb=ef0891e470ff35840def7a5717ede18a58266e76;hp=7b03394e4a76002963d9f8677c2fcd3ffa519163;hpb=89a02d3ba803a1d85d745e22b4ac05ef8cb12370;p=sbcl.git diff --git a/make-config.sh b/make-config.sh index 7b03394..f251797 100644 --- a/make-config.sh +++ b/make-config.sh @@ -44,7 +44,9 @@ bad_option() { WITH_FEATURES="" WITHOUT_FEATURES="" +FANCY_FEATURES=":sb-core-compression :sb-xref-for-internals :sb-after-xc-core" +fancy=false some_options=false for option do @@ -88,6 +90,11 @@ do --without) WITHOUT_FEATURES="$WITHOUT_FEATURES :$optarg" ;; + --fancy) + WITH_FEATURES="$WITH_FEATURES $FANCY_FEATURES" + # Lower down we add :sb-thread for platforms where it can be built. + fancy=true + ;; -*) bad_option "Unknown command-line option to $0: \"$option\"" ;; @@ -111,6 +118,7 @@ then # customize-target-features.lisp... echo "ERROR: Both customize-target-features.lisp, and feature-options" echo "to make.sh present -- cannot use both at the same time." + exit 1 fi # Previously XC host was provided as a positional argument. @@ -158,6 +166,12 @@ Options: --with- Build with specified feature. --without- Build wihout the specfied feature. + --fancy Build with several optional features: + + $FANCY_FEATURES + + Plus threading on platforms which support it. + --arch= Specify the architecture to build for. Mainly for doing x86 builds on x86-64. @@ -279,7 +293,16 @@ esac link_or_copy() { if [ "$sbcl_os" = "win32" ] ; then - cp -r "$1" "$2" + # Use preprocessor or makefile includes instead of copying if + # possible, to avoid unexpected use of the original, unchanged + # files when re-running only make-target-1 during development. + if echo "$1" | egrep '[.][ch]$'; then + echo "#include \"$1\"" >"$2" + elif echo "$1" | egrep '^Config[.]'; then + echo "include $1" >"$2" + else + cp -r "$1" "$2" + fi else ln -s "$1" "$2" fi @@ -308,14 +331,6 @@ echo //entering make-config.sh echo //ensuring the existence of output/ directory if [ ! -d output ] ; then mkdir output; fi -ltf=`pwd`/local-target-features.lisp-expr -echo //initializing $ltf -echo ';;;; This is a machine-generated file.' > $ltf -echo ';;;; Please do not edit it by hand.' >> $ltf -echo ';;;; See make-config.sh.' >> $ltf -echo "((lambda (features) (set-difference features (list$WITHOUT_FEATURES)))" >> $ltf -printf " (union (list$WITH_FEATURES) (list " >> $ltf - echo //guessing default target CPU architecture from host architecture case `uname -m` in *86) guessed_sbcl_arch=x86 ;; @@ -350,16 +365,47 @@ if [ "$sbcl_os" = "darwin" ] && [ "`/usr/sbin/sysctl -n hw.optional.x86_64`" = " fi echo //setting up CPU-architecture-dependent information +if test -n "$SBCL_ARCH" +then + # Normalize it. + SBCL_ARCH=`echo $SBCL_ARCH | tr '[A-Z]' '[a-z]' | tr _ -` +fi sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch} echo sbcl_arch=\"$sbcl_arch\" if [ "$sbcl_arch" = "" ] ; then echo "can't guess target SBCL architecture, please specify --arch=" exit 1 fi +if $fancy +then + # If --fancy, enable threads on platforms where they can be built. + case $sbcl_arch in + x86|x86-64|ppc) + if [ "$sbcl_os" = "sunos" ] && [ "$sbcl_arch" = "x86-64" ] + then + echo "No threads on this platform." + else + WITH_FEATURES="$WITH_FEATURES :sb-thread" + echo "Enabling threads due to --fancy." + fi + ;; + *) + echo "No threads on this platform." + ;; + esac +fi + +ltf=`pwd`/local-target-features.lisp-expr +echo //initializing $ltf +echo ';;;; This is a machine-generated file.' > $ltf +echo ';;;; Please do not edit it by hand.' >> $ltf +echo ';;;; See make-config.sh.' >> $ltf +echo "((lambda (features) (set-difference features (list$WITHOUT_FEATURES)))" >> $ltf +printf " (union (list$WITH_FEATURES) (list " >> $ltf + printf ":%s" "$sbcl_arch" >> $ltf echo //setting up OS-dependent information - # Under Darwin x86-64, guess whether Darwin 9+ or below. if [ "$sbcl_os" = "darwin" ] && [ "$sbcl_arch" = "x86-64" ]; then darwin_version=`uname -r` @@ -480,6 +526,7 @@ case "$sbcl_os" in ;; win32) printf ' :win32' >> $ltf + printf ' :sb-qshow' >> $ltf link_or_copy Config.$sbcl_arch-win32 Config link_or_copy $sbcl_arch-win32-os.h target-arch-os.h link_or_copy win32-os.h target-os.h @@ -542,16 +589,10 @@ elif [ "$sbcl_arch" = "x86-64" ]; then 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 ' :cheneygc :linkage-table' >> $ltf printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf printf ' :alien-callbacks' >> $ltf - # Use a little C program to try to guess the endianness. Ware - # cross-compilers! - # - # FIXME: integrate to grovel-features, mayhaps - $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime - tools-for-build/determine-endianness >> $ltf 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 @@ -581,13 +622,16 @@ elif [ "$sbcl_arch" = "sparc" ]; then # FUNCDEF macro for assembler. No harm in running this on sparc-linux # as well. sh tools-for-build/sparc-funcdef.sh > src/runtime/sparc-funcdef.h + printf ' :cheneygc' >> $ltf if [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "linux" ]; then printf ' :linkage-table' >> $ltf fi printf ' :stack-allocatable-closures :stack-allocatable-lists' >> $ltf elif [ "$sbcl_arch" = "alpha" ]; then + printf ' :cheneygc' >> $ltf printf ' :stack-allocatable-closures :stack-allocatable-lists' >> $ltf elif [ "$sbcl_arch" = "hppa" ]; then + printf ' :cheneygc' >> $ltf printf ' :stack-allocatable-vectors :stack-allocatable-fixed-objects' >> $ltf printf ' :stack-allocatable-lists' >> $ltf else @@ -595,6 +639,13 @@ else echo > /dev/null fi +# Use a little C program to try to guess the endianness. Ware +# cross-compilers! +# +# FIXME: integrate to grovel-features, mayhaps +$GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime +tools-for-build/determine-endianness >> $ltf + export sbcl_os sbcl_arch sh tools-for-build/grovel-features.sh >> $ltf