diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3/configure')
| -rwxr-xr-x | gcc-4.9/libstdc++-v3/configure | 88 |
1 files changed, 63 insertions, 25 deletions
diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure index 44bc17bc2..4d3fa1e5f 100755 --- a/gcc-4.9/libstdc++-v3/configure +++ b/gcc-4.9/libstdc++-v3/configure @@ -665,6 +665,9 @@ LIBICONV OPT_LDFLAGS SECTION_LDFLAGS GLIBCXX_LIBS +ENABLE_BIONIC_LIBS_FALSE +ENABLE_BIONIC_LIBS_TRUE +USE_BIONIC_LIBS ENABLE_VTABLE_VERIFY_FALSE ENABLE_VTABLE_VERIFY_TRUE VTV_CXXLINKFLAGS @@ -873,6 +876,7 @@ enable_extern_template with_python_dir enable_werror enable_vtable_verify +enable_bionic_libs enable_libstdcxx_time enable_tls enable_rpath @@ -1566,6 +1570,7 @@ Optional Features: enable extern template [default=yes] --enable-werror turns on -Werror [default=yes] --enable-vtable-verify enable vtable verify [default=no] + --enable-bionic-libs enable bionic libs [default=no] --enable-libstdcxx-time[=KIND] use KIND for check type [default=auto] --enable-tls Use thread-local storage [default=yes] @@ -11542,7 +11547,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11544 "configure" +#line 11550 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11648,7 +11653,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11650 "configure" +#line 11656 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15068,7 +15073,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 15070 "configure" +#line 15076 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15420,7 +15425,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15420 "configure" +#line 15428 "configure" int main() { typedef bool atomic_type; @@ -15455,7 +15460,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15455 "configure" +#line 15463 "configure" int main() { typedef short atomic_type; @@ -15490,7 +15495,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15490 "configure" +#line 15498 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15526,7 +15531,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15526 "configure" +#line 15534 "configure" int main() { typedef long long atomic_type; @@ -15605,7 +15610,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15605 "configure" +#line 15613 "configure" int main() { _Decimal32 d1; @@ -15647,7 +15652,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15647 "configure" +#line 15655 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -15681,7 +15686,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15681 "configure" +#line 15689 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -17453,6 +17458,36 @@ $as_echo "$enable_vtable_verify" >&6; } + + # Check whether --enable-bionic-libs was given. +if test "${enable_bionic_libs+set}" = set; then : + enableval=$enable_bionic_libs; + case "$enableval" in + yes|no) ;; + *) as_fn_error "Argument to enable/disable bionic-libs must be yes or no" "$LINENO" 5 ;; + esac + +else + enable_bionic_libs=no +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bionic libs support" >&5 +$as_echo_n "checking for bionic libs support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_bionic_libs" >&5 +$as_echo "$enable_bionic_libs" >&6; } + + if test $enable_bionic_libs = yes; then + USE_BIONIC_LIBS="TRUE" + else + USE_BIONIC_LIBS="FALSE" + fi + + + + + # Checks for operating systems support that doesn't require linking. @@ -77209,12 +77244,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/syscall.h> int lk; -#if !defined(SYS_gettid) -#define SYS_gettid __NR_gettid -#endif -#if !defined(SYS_futex) -#define SYS_futex __NR_futex -#endif int main () { @@ -77273,12 +77302,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/syscall.h> int lk; -#if !defined(SYS_gettid) -#define SYS_gettid __NR_gettid -#endif -#if !defined(SYS_futex) -#define SYS_futex __NR_futex -#endif int main () { @@ -78115,12 +78138,14 @@ fi $as_echo "$glibcxx_ptrdiff_t_is_i" >&6; } + case "$target" in - *android*) libtool_version_info_string="-avoid-version" ;; - *) libtool_version_info_string="-version-info $libtool_VERSION" + *android*) libtool_version_info_string="-avoid-version" ;; + *) libtool_version_info_string="-version-info $libtool_VERSION" esac + # Check whether --enable-libstdcxx-visibility was given. if test "${enable_libstdcxx_visibility+set}" = set; then : enableval=$enable_libstdcxx_visibility; @@ -78691,7 +78716,7 @@ $as_echo_n "checking for gthreads library... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "gthr-$target_thread_file.h" +#include "gthr.h" int main () { @@ -79293,6 +79318,15 @@ else fi + if test $enable_bionic_libs = yes; then + ENABLE_BIONIC_LIBS_TRUE= + ENABLE_BIONIC_LIBS_FALSE='#' +else + ENABLE_BIONIC_LIBS_TRUE='#' + ENABLE_BIONIC_LIBS_FALSE= +fi + + if test $enable_symvers != no; then ENABLE_SYMVERS_TRUE= ENABLE_SYMVERS_FALSE='#' @@ -79740,6 +79774,10 @@ if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FAL as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_BIONIC_LIBS_TRUE}" && test -z "${ENABLE_BIONIC_LIBS_FALSE}"; then + as_fn_error "conditional \"ENABLE_BIONIC_LIBS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_SYMVERS_TRUE}" && test -z "${ENABLE_SYMVERS_FALSE}"; then as_fn_error "conditional \"ENABLE_SYMVERS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |