diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3/configure')
| -rwxr-xr-x | gcc-4.9/libstdc++-v3/configure | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure index 0f6a766b3..44bc17bc2 100755 --- a/gcc-4.9/libstdc++-v3/configure +++ b/gcc-4.9/libstdc++-v3/configure @@ -645,6 +645,7 @@ GLIBCXX_LDBL_COMPAT_FALSE GLIBCXX_LDBL_COMPAT_TRUE ENABLE_VISIBILITY_FALSE ENABLE_VISIBILITY_TRUE +libtool_version_info_string libtool_VERSION ENABLE_SYMVERS_SUN_FALSE ENABLE_SYMVERS_SUN_TRUE @@ -8100,7 +8101,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -11526,7 +11542,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11529 "configure" +#line 11544 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11632,7 +11648,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11635 "configure" +#line 11650 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15052,7 +15068,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 15055 "configure" +#line 15070 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15404,7 +15420,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15407 "configure" +#line 15420 "configure" int main() { typedef bool atomic_type; @@ -15439,7 +15455,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15442 "configure" +#line 15455 "configure" int main() { typedef short atomic_type; @@ -15474,7 +15490,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15477 "configure" +#line 15490 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15510,7 +15526,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15513 "configure" +#line 15526 "configure" int main() { typedef long long atomic_type; @@ -15589,7 +15605,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 15592 "configure" +#line 15605 "configure" int main() { _Decimal32 d1; @@ -15631,7 +15647,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15634 "configure" +#line 15647 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -15665,7 +15681,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15668 "configure" +#line 15681 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -15680,6 +15696,8 @@ int main() } EOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __float128" >&5 $as_echo_n "checking for __float128... " >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15687,8 +15705,7 @@ $as_echo_n "checking for __float128... " >&6; } ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - -$as_echo "#define _GLIBCXX_USE_FLOAT128 1" >>confdefs.h + $as_echo "#define _GLIBCXX_USE_FLOAT128 1" >>confdefs.h enable_float128=yes else @@ -78098,6 +78115,10 @@ 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" +esac # Check whether --enable-libstdcxx-visibility was given. @@ -78266,9 +78287,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - if test $ac_cv_x86_rdrand = yes; then -$as_echo "#define _GLIBCXX_X86_RDRAND 1" >>confdefs.h + + if test $ac_cv_x86_rdrand = yes; then + $as_echo "#define _GLIBCXX_X86_RDRAND 1" >>confdefs.h fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x86_rdrand" >&5 |