X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure;h=6310e0b9320c5a8c89db79595ab02df948f488b4;hb=22e5bbd0deadcbd767864bd714e890b70e1fe1df;hp=09a0c43659948a4df8df151638722304ca4094e7;hpb=b9410061e2ad6fe91bb3910c3adc7d4a315b7ce9;p=android-x86%2Fexternal-musl-libc.git diff --git a/configure b/configure index 09a0c436..6310e0b9 100755 --- a/configure +++ b/configure @@ -31,7 +31,6 @@ Optional features: --enable-optimize=... optimize listed components for speed over size [auto] --enable-debug build with debugging information [disabled] --enable-warnings build with recommended warnings flags [disabled] - --enable-visibility use global visibility options to optimize PIC [no] --enable-wrapper=... build given musl toolchain wrapper [auto] --disable-shared inhibit building shared library [enabled] --disable-static inhibit building static library [enabled] @@ -135,7 +134,6 @@ target= optimize=auto debug=no warnings=no -visibility=no shared=auto static=yes wrapper=auto @@ -163,9 +161,6 @@ case "$arg" in --disable-debug|--enable-debug=no) debug=no ;; --enable-warnings|--enable-warnings=yes) warnings=yes ;; --disable-warnings|--enable-warnings=no) warnings=no ;; ---enable-visibility=auto) visibility=auto ;; ---enable-visibility|--enable-visibility=yes) visibility=yes ;; ---disable-visibility|--enable-visibility=no) visibility=no ;; --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 ;; @@ -320,12 +315,13 @@ i?86*) ARCH=i386 ;; x86_64-x32*|x32*|x86_64*x32) ARCH=x32 ;; x86_64-nt64*) ARCH=nt64 ;; x86_64*) ARCH=x86_64 ;; +m68k*) ARCH=m68k ;; mips64*|mipsisa64*) ARCH=mips64 ;; mips*) ARCH=mips ;; microblaze*) ARCH=microblaze ;; or1k*) ARCH=or1k ;; -powerpc64*) ARCH=powerpc64 ;; -powerpc*) ARCH=powerpc ;; +powerpc64*|ppc64*) ARCH=powerpc64 ;; +powerpc*|ppc*) ARCH=powerpc ;; sh[1-9bel-]*|sh|superh*) ARCH=sh ;; s390x*) ARCH=s390x ;; unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;; @@ -511,7 +507,7 @@ tryflag CFLAGS_AUTO -Werror=pointer-arith # parameter to stop printing warnings about LDFLAGS passed during # compiling stage and CFLAGS passed during linking stage. # -tryflag CFLAGS_AUTO -Qunused-arguments +test "$cc_family" = clang && tryflag CFLAGS_AUTO -Qunused-arguments if test "x$warnings" = xyes ; then tryflag CFLAGS_AUTO -Wall @@ -524,39 +520,6 @@ tryflag CFLAGS_AUTO -Wno-unknown-pragmas tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast fi -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... " -cat > "$tmpc" </dev/null 2>&1 ; then -visibility=yes -else -visibility=no -fi -printf "%s\n" "$visibility" -fi - -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. @@ -616,6 +579,7 @@ fi if test "$ARCH" = "arm" ; then if trycppif __thumb2__ "$t" ; then +tryflag CFLAGS_AUTO -mimplicit-it=always tryflag CFLAGS_AUTO -Wa,-mimplicit-it=always tryflag CFLAGS_AUTO -Wa,-mthumb fi @@ -641,6 +605,13 @@ if test "$ARCH" = "aarch64" ; then trycppif __AARCH64EB__ "$t" && SUBARCH=${SUBARCH}_be fi +if test "$ARCH" = "m68k" ; then +if trycppif "__HAVE_68881__" ; then : ; +elif trycppif "__mcffpu__" ; then SUBARCH="-fp64" +else SUBARCH="-sf" +fi +fi + if test "$ARCH" = "mips" ; then trycppif "__mips_isa_rev >= 6" "$t" && SUBARCH=${SUBARCH}r6 trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el