diff options
Diffstat (limited to 'gcc-4.7/libstdc++-v3/configure')
| -rwxr-xr-x | gcc-4.7/libstdc++-v3/configure | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/gcc-4.7/libstdc++-v3/configure b/gcc-4.7/libstdc++-v3/configure index c7c6777b7..57633d9d1 100755 --- a/gcc-4.7/libstdc++-v3/configure +++ b/gcc-4.7/libstdc++-v3/configure @@ -3026,8 +3026,7 @@ test -n "$target_alias" && target_alias=${target_alias-$host_alias} # Handy for debugging: -{ $as_echo "$as_me:${as_lineno-$LINENO}: $build / $host / $target / $host_alias / $target_alias" >&5 -$as_echo "$as_me: $build / $host / $target / $host_alias / $target_alias" >&6;}; sleep 5 +#AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5 if test "$build" != "$host"; then # We are being configured with some form of cross compiler. @@ -7121,7 +7120,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -11499,7 +11505,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11501 "configure" +#line 11507 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11605,7 +11611,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11607 "configure" +#line 11613 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14963,7 +14969,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14965 "configure" +#line 14971 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15298,7 +15304,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15300 "configure" +#line 15306 "configure" int main() { typedef bool atomic_type; @@ -15333,7 +15339,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15335 "configure" +#line 15341 "configure" int main() { typedef short atomic_type; @@ -15368,7 +15374,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15370 "configure" +#line 15376 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15404,7 +15410,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15406 "configure" +#line 15412 "configure" int main() { typedef long long atomic_type; @@ -15483,7 +15489,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 15485 "configure" +#line 15491 "configure" int main() { _Decimal32 d1; @@ -15525,7 +15531,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15527 "configure" +#line 15533 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -15559,7 +15565,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15561 "configure" +#line 15567 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; |