X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure;h=a296f8ab0a10e3b9fdb831a112668ed0d94e5e3e;hb=c18d05f0e8909ec54252b251c441b5dd903268f8;hp=1b6b46495b03fe12d67db2102b9bfd178c094f2d;hpb=428462a4c355f32e09fa5e578043c15ea91e29f7;p=musl diff --git a/configure b/configure index 1b6b4649..a296f8ab 100755 --- a/configure +++ b/configure @@ -9,6 +9,9 @@ VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. +Configuration: + --srcdir=DIR source directory [detected] + Installation directories: --prefix=PREFIX main installation prefix [/usr/local/musl] --exec-prefix=EPREFIX installation prefix for executable files [PREFIX] @@ -28,7 +31,7 @@ Optional features: --enable-debug build with debugging information [disabled] --enable-warnings build with recommended warnings flags [disabled] --enable-visibility use global visibility options to optimize PIC [auto] - --enable-gcc-wrapper build musl-gcc toolchain wrapper [auto] + --enable-wrapper=... build given musl toolchain wrapper [auto] --disable-shared inhibit building shared library [enabled] --disable-static inhibit building static library [enabled] @@ -80,7 +83,7 @@ fi tryflag () { printf "checking whether compiler accepts %s... " "$2" echo "typedef int x;" > "$tmpc" -if $CC $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then +if $CC $CFLAGS_TRY $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then printf "yes\n" eval "$1=\"\${$1} \$2\"" eval "$1=\${$1# }" @@ -94,7 +97,7 @@ fi tryldflag () { printf "checking whether linker accepts %s... " "$2" echo "typedef int x;" > "$tmpc" -if $CC -nostdlib -shared "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then +if $CC $LDFLAGS_TRY -nostdlib -shared "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then printf "yes\n" eval "$1=\"\${$1} \$2\"" eval "$1=\${$1# }" @@ -113,14 +116,19 @@ CFLAGS_C99FSE= CFLAGS_AUTO= CFLAGS_MEMOPS= CFLAGS_NOSSP= +CFLAGS_TRY= LDFLAGS_AUTO= +LDFLAGS_TRY= OPTIMIZE_GLOBS= +srcdir= prefix=/usr/local/musl exec_prefix='$(prefix)' bindir='$(exec_prefix)/bin' libdir='$(prefix)/lib' includedir='$(prefix)/include' syslibdir='/lib' +tools= +tool_libs= target= optimize=auto debug=no @@ -129,10 +137,13 @@ visibility=auto shared=auto static=yes wrapper=auto +gcc_wrapper=no +clang_wrapper=no for arg ; do case "$arg" in --help) usage ;; +--srcdir=*) srcdir=${arg#*=} ;; --prefix=*) prefix=${arg#*=} ;; --exec-prefix=*) exec_prefix=${arg#*=} ;; --bindir=*) bindir=${arg#*=} ;; @@ -152,7 +163,12 @@ case "$arg" in --disable-warnings|--enable-warnings=no) warnings=no ;; --enable-visibility|--enable-visibility=yes) visibility=yes ;; --disable-visibility|--enable-visibility=no) visibility=no ;; ---enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ;; +--enable-wrapper|--enable-wrapper=yes) wrapper=detect ;; +--enable-wrapper=all) wrapper=yes ; gcc_wrapper=yes ; clang_wrapper=yes ;; +--enable-wrapper=gcc) wrapper=yes ; gcc_wrapper=yes ;; +--enable-wrapper=clang) wrapper=yes ; clang_wrapper=yes ;; +--disable-wrapper|--enable-wrapper=no) wrapper=no ;; +--enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ; gcc_wrapper=yes ;; --disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*|--build=*) ;; --host=*|--target=*) target=${arg#*=} ;; @@ -168,10 +184,22 @@ LIBCC=*) LIBCC=${arg#*=} ;; esac done -for i in prefix exec_prefix bindir libdir includedir syslibdir ; do +for i in srcdir prefix exec_prefix bindir libdir includedir syslibdir ; do stripdir $i done +# +# Get the source dir for out-of-tree builds +# +if test -z "$srcdir" ; then +srcdir="${0%/configure}" +stripdir srcdir +fi +abs_builddir="$(pwd)" || fail "$0: cannot determine working directory" +abs_srcdir="$(cd $srcdir && pwd)" || fail "$0: invalid source directory $srcdir" +test "$abs_srcdir" = "$abs_builddir" && srcdir=. +test "$srcdir" != "." -a -f Makefile -a ! -h Makefile && fail "$0: Makefile already exists in the working directory" + # # Get a temp filename we can use # @@ -205,36 +233,59 @@ exit 1 fi # -# Need to know if the compiler is gcc to decide whether to build the -# musl-gcc wrapper, and for critical bug detection in some gcc versions. +# Figure out options to force errors on unknown flags. # -printf "checking whether compiler is gcc... " -if fnmatch '*gcc\ version*' "$(LC_ALL=C $CC -v 2>&1)" ; then -cc_is_gcc=yes -else -cc_is_gcc=no +tryflag CFLAGS_TRY -Werror=unknown-warning-option +tryflag CFLAGS_TRY -Werror=unused-command-line-argument +tryldflag LDFLAGS_TRY -Werror=unknown-warning-option +tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument + +# +# Need to know if the compiler is gcc or clang to decide which toolchain +# wrappers to build. +# +printf "checking for C compiler family... " +cc_ver="$(LC_ALL=C $CC -v 2>&1)" +cc_family=unknown +if fnmatch '*gcc\ version*' "$cc_ver" ; then +cc_family=gcc +elif fnmatch '*clang\ version*' "$cc_ver" ; then +cc_family=clang fi -echo "$cc_is_gcc" +echo "$cc_family" # -# Only build musl-gcc wrapper if toolchain does not already target musl +# Figure out toolchain wrapper to build # -if test "$wrapper" = auto ; then -printf "checking whether to build musl-gcc wrapper... " -if test "$cc_is_gcc" = yes ; then -wrapper=yes -while read line ; do -case "$line" in */ld-musl-*) wrapper=no ;; esac -done <" > "$tmpc" +echo "#if ! __GLIBC__" >> "$tmpc" +echo "#error no" >> "$tmpc" +echo "#endif" >> "$tmpc" +printf "checking for toolchain wrapper to build... " +if test "$wrapper" = auto && ! $CC -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then +echo "none" +elif test "$cc_family" = gcc ; then +gcc_wrapper=yes +echo "gcc" +elif test "$cc_family" = clang ; then +clang_wrapper=yes +echo "clang" else -wrapper=no +echo "none" +if test "$wrapper" = detect ; then +fail "$0: could not find an appropriate toolchain wrapper" +fi fi -echo "$wrapper" fi - +if test "$gcc_wrapper" = yes ; then +tools="$tools obj/musl-gcc" +tool_libs="$tool_libs lib/musl-gcc.specs" +fi +if test "$clang_wrapper" = yes ; then +tools="$tools obj/musl-clang obj/ld.musl-clang" +fi # # Find the target architecture @@ -287,7 +338,7 @@ __attribute__((__may_alias__)) #endif x; EOF -if $CC $CFLAGS_C99FSE -I./arch/$ARCH -I./include $CPPFLAGS $CFLAGS \ +if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS \ -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then printf "no\n" else @@ -295,6 +346,13 @@ printf "yes\n" CFLAGS_C99FSE="$CFLAGS_C99FSE -D__may_alias__=" fi +# +# The GNU toolchain defaults to assuming unmarked files need an +# executable stack, potentially exposing vulnerabilities in programs +# linked with such object files. Fix this. +# +tryflag CFLAGS_C99FSE -Wa,--noexecstack + # # Check for options to disable stack protector, which needs to be # disabled for a few early-bootstrap translation units. If not found, @@ -316,6 +374,22 @@ tryflag CFLAGS_MEMOPS -fno-tree-loop-distribute-patterns # test "$debug" = yes && CFLAGS_AUTO=-g +# +# Preprocess asm files to add extra debugging information if debug is +# enabled, our assembler supports the needed directives, and the +# preprocessing script has been written for our architecture. +# +printf "checking whether we should preprocess assembly to add debugging information... " +if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" && + test -f "tools/add-cfi.$ARCH.awk" && + printf ".file 1 \"srcfile.s\"\n.line 1\n.cfi_startproc\n.cfi_endproc" | $CC -g -x assembler -c -o /dev/null 2>/dev/null - +then + ADD_CFI=yes +else + ADD_CFI=no +fi +printf "%s\n" "$ADD_CFI" + # # Possibly add a -O option to CFLAGS and select modules to optimize with # -O3 based on the status of --enable-optimize and provided CFLAGS. @@ -380,11 +454,15 @@ tryflag CFLAGS_AUTO -fno-unwind-tables tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables # -# The GNU toolchain defaults to assuming unmarked files need an -# executable stack, potentially exposing vulnerabilities in programs -# linked with such object files. Fix this. +# Attempt to put each function and each data object in its own +# section. This both allows additional size optimizations at link +# time and works around a dangerous class of compiler/assembler bugs +# whereby relative address expressions are constant-folded by the +# assembler even when one or more of the symbols involved is +# replaceable. See gas pr 18561 and gcc pr 66609, 68178, etc. # -tryflag CFLAGS_AUTO -Wa,--noexecstack +tryflag CFLAGS_AUTO -ffunction-sections +tryflag CFLAGS_AUTO -fdata-sections # # On x86, make sure we don't have incompatible instruction set @@ -421,17 +499,25 @@ tryflag CFLAGS_AUTO -Wno-unknown-pragmas tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast fi -if test "x$visibility" == xauto ; then +if test "x$visibility" = xauto ; then # This test checks toolchain support for several things: # - the -include option # - the attributes/pragmas used in vis.h # - linking code that takes the address of protected symbols +# - gcc 3.x bug that wrongly claims declarations mismatch printf "checking whether global visibility preinclude works... " -echo 'int (*fp)(void);' > "$tmpc" -echo 'int foo(void) { }' >> "$tmpc" -echo 'int bar(void) { fp = foo; return foo(); }' >> "$tmpc" +cat > "$tmpc" </dev/null 2>&1 ; then visibility=yes @@ -441,14 +527,44 @@ fi printf "%s\n" "$visibility" fi -if test "x$visibility" == xyes ; then +if test "x$visibility" = xyes ; then CFLAGS_AUTO="$CFLAGS_AUTO -include vis.h" CFLAGS_AUTO="${CFLAGS_AUTO# }" fi +# Determine if the compiler produces position-independent code (PIC) +# by default. If so, we don't need to compile separate object files +# for libc.a and libc.so. +if trycppif __PIC__ "$CFLAGS_C99FSE $CPPFLAGS $CFLAGS" ; then +pic_default=yes +else +pic_default=no +fi + +# Reduce space lost to padding for alignment purposes by sorting data +# objects according to their alignment reqirements. This approximates +# optimal packing. +tryldflag LDFLAGS_AUTO -Wl,--sort-section,alignment +tryldflag LDFLAGS_AUTO -Wl,--sort-common + +# When linking shared library, drop dummy weak definitions that were +# replaced by strong definitions from other translation units. +tryldflag LDFLAGS_AUTO -Wl,--gc-sections + # Some patched GCC builds have these defaults messed up... tryldflag LDFLAGS_AUTO -Wl,--hash-style=both +# Prevent linking if there are undefined symbols; if any exist, +# libc.so will crash at runtime during relocation processing. +# The common way this can happen is failure to link the compiler +# runtime library; implementation error is also a possibility. +tryldflag LDFLAGS_AUTO -Wl,--no-undefined + +# Avoid exporting symbols from compiler runtime libraries. They +# should be hidden anyway, but some toolchains including old gcc +# versions built without shared library support and pcc are broken. +tryldflag LDFLAGS_AUTO -Wl,--exclude-libs=ALL + test "$shared" = "no" || { # Disable dynamic linking if ld is broken and can't do -Bsymbolic-functions LDFLAGS_DUMMY= @@ -492,6 +608,7 @@ test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \ && SUBARCH=${SUBARCH}el if test "$ARCH" = "sh" ; then +tryflag CFLAGS_AUTO -Wa,--isa=any trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb if trycppif "__SH_FPU_ANY__ || __SH4__" "$t" ; then # Some sh configurations are broken and replace double with float @@ -508,6 +625,9 @@ fi else SUBARCH=${SUBARCH}-nofpu fi +if trycppif __SH_FDPIC__ "$t" ; then +SUBARCH=${SUBARCH}-fdpic +fi fi test "$SUBARCH" \ @@ -531,8 +651,9 @@ echo '#include ' > "$tmpc" echo '#if LDBL_MANT_DIG == 53' >> "$tmpc" echo 'typedef char ldcheck[9-(int)sizeof(long double)];' >> "$tmpc" echo '#endif' >> "$tmpc" -if $CC $CFLAGS_C99FSE -I./arch/$ARCH -I./include $CPPFLAGS $CFLAGS \ - -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then +if $CC $CFLAGS_C99FSE \ + -I$srcdir/arch/$ARCH -I$srcdir/arch/generic -I$srcdir/include \ + $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then printf "yes\n" else printf "no\n" @@ -554,6 +675,7 @@ cat << EOF ARCH = $ARCH SUBARCH = $SUBARCH ASMSUBARCH = $ASMSUBARCH +srcdir = $srcdir prefix = $prefix exec_prefix = $exec_prefix bindir = $bindir @@ -561,20 +683,28 @@ libdir = $libdir includedir = $includedir syslibdir = $syslibdir CC = $CC -CFLAGS = $CFLAGS_AUTO $CFLAGS +CFLAGS = $CFLAGS +CFLAGS_AUTO = $CFLAGS_AUTO CFLAGS_C99FSE = $CFLAGS_C99FSE CFLAGS_MEMOPS = $CFLAGS_MEMOPS CFLAGS_NOSSP = $CFLAGS_NOSSP CPPFLAGS = $CPPFLAGS -LDFLAGS = $LDFLAGS_AUTO $LDFLAGS +LDFLAGS = $LDFLAGS +LDFLAGS_AUTO = $LDFLAGS_AUTO CROSS_COMPILE = $CROSS_COMPILE LIBCC = $LIBCC OPTIMIZE_GLOBS = $OPTIMIZE_GLOBS +ALL_TOOLS = $tools +TOOL_LIBS = $tool_libs +ADD_CFI = $ADD_CFI EOF test "x$static" = xno && echo "STATIC_LIBS =" test "x$shared" = xno && echo "SHARED_LIBS =" -test "x$wrapper" = xno && echo "ALL_TOOLS =" -test "x$wrapper" = xno && echo "TOOL_LIBS =" +test "x$cc_family" = xgcc && echo 'WRAPCC_GCC = $(CC)' +test "x$cc_family" = xclang && echo 'WRAPCC_CLANG = $(CC)' +test "x$pic_default" = xyes && echo 'AOBJS = $(LOBJS)' exec 1>&3 3>&- +test "$srcdir" = "." || ln -sf $srcdir/Makefile . + printf "done\n"