From e6d5f8c9c4ea05926bc31b0bbcef08134401d19a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 16 May 2012 22:11:18 +0000 Subject: [PATCH] Regenerate configure files for libtool.m4 change boehm-gc/ * configure: Regenerated. gcc/ * configure: Regenerated. libatomic/ * configure: Regenerated. libffi/ * configure: Regenerated. libgfortran/ * configure: Regenerated. libgomp/ * configure: Regenerated. libitm/ * configure: Regenerated. libjava/classpath/ * configure: Regenerated. libjava/ * configure: Regenerated. libmudflap/ * configure: Regenerated. libobjc/ * configure: Regenerated. libquadmath/ * configure: Regenerated. libssp/ * configure: Regenerated. libstdc++-v3/ * configure: Regenerated. lto-plugin/ * configure: Regenerated. zlib/ * configure: Regenerated. From-SVN: r187616 --- boehm-gc/ChangeLog | 4 ++++ boehm-gc/configure | 13 ++++++++++--- gcc/ChangeLog | 4 ++++ gcc/configure | 13 ++++++++++--- libatomic/ChangeLog | 4 ++++ libatomic/configure | 13 ++++++++++--- libffi/ChangeLog.libgcj | 4 ++++ libffi/configure | 13 ++++++++++--- libgfortran/ChangeLog | 4 ++++ libgfortran/configure | 13 ++++++++++--- libgomp/ChangeLog | 4 ++++ libgomp/configure | 13 ++++++++++--- libitm/ChangeLog | 4 ++++ libitm/configure | 13 ++++++++++--- libjava/ChangeLog | 4 ++++ libjava/classpath/ChangeLog.gcj | 4 ++++ libjava/classpath/configure | 21 ++++++++++++++------- libjava/configure | 15 +++++++++++---- libmudflap/ChangeLog | 4 ++++ libmudflap/configure | 13 ++++++++++--- libobjc/ChangeLog | 4 ++++ libobjc/configure | 15 +++++++++++---- libquadmath/ChangeLog | 4 ++++ libquadmath/configure | 13 ++++++++++--- libssp/ChangeLog | 4 ++++ libssp/configure | 13 ++++++++++--- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/configure | 29 ++++++++++++++++++----------- lto-plugin/ChangeLog | 4 ++++ lto-plugin/configure | 13 ++++++++++--- zlib/ChangeLog.gcj | 4 ++++ zlib/configure | 13 ++++++++++--- 32 files changed, 238 insertions(+), 62 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 0d830836583..f25fbbcd893 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-05-11 H.J. Lu Merge upstream changes diff --git a/boehm-gc/configure b/boehm-gc/configure index c76ea447af5..aa610539399 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -6786,7 +6786,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" @@ -11304,7 +11311,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11307 "configure" +#line 11314 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11410,7 +11417,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11413 "configure" +#line 11420 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b05a5b573d7..412e661949a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-05-16 Andrew Pinski * gimple-fold.c (get_maxval_strlen): Move COND_EXPR handling under diff --git a/gcc/configure b/gcc/configure index 4f43eaa7e51..db2021ca2d4 100755 --- a/gcc/configure +++ b/gcc/configure @@ -13746,7 +13746,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" @@ -17960,7 +17967,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17963 "configure" +#line 17970 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18066,7 +18073,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18069 "configure" +#line 18076 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 21e17ccfe65..4f170244a2e 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-05-10 Rainer Orth PR other/53284 diff --git a/libatomic/configure b/libatomic/configure index a3b819d0032..9a7e5a53c04 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -6524,7 +6524,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" @@ -11008,7 +11015,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11011 "configure" +#line 11018 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11114,7 +11121,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11117 "configure" +#line 11124 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj index ea5d02f19ba..21d7ccf070a 100644 --- a/libffi/ChangeLog.libgcj +++ b/libffi/ChangeLog.libgcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2004-01-14 Kelley Cook * configure.in: Add in AC_PREREQ(2.13) diff --git a/libffi/configure b/libffi/configure index 15914953909..28ed5131ca5 100755 --- a/libffi/configure +++ b/libffi/configure @@ -6282,7 +6282,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" @@ -10766,7 +10773,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10769 "configure" +#line 10776 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10872,7 +10879,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10875 "configure" +#line 10882 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index cac6a62d147..a6cf6fde3ad 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-05-16 Tobias Burnus * io/unix.c (tempfile_open): Pass mode to "open" for O_CREAT. diff --git a/libgfortran/configure b/libgfortran/configure index e2db9ea2537..80bfe84bb89 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -8074,7 +8074,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" @@ -12321,7 +12328,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12324 "configure" +#line 12331 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12427,7 +12434,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12430 "configure" +#line 12437 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index bc6d5c47792..f8d57398bc6 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-04-11 Manuel López-Ibáñez * testsuite/lib/libgomp.exp: Add -fno-diagnostics-show-caret. diff --git a/libgomp/configure b/libgomp/configure index 8ed841a06e0..418c471ce59 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -6596,7 +6596,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" @@ -11080,7 +11087,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11083 "configure" +#line 11090 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11186,7 +11193,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11189 "configure" +#line 11196 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libitm/ChangeLog b/libitm/ChangeLog index ac616d69aa2..688eddac159 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-04-04 H.J. Lu PR libitm/52854 diff --git a/libitm/configure b/libitm/configure index 8e1d19ee5a8..6495c44ae33 100644 --- a/libitm/configure +++ b/libitm/configure @@ -7285,7 +7285,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" @@ -11770,7 +11777,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11773 "configure" +#line 11780 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11876,7 +11883,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11879 "configure" +#line 11886 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f417a49a5a4..619c88e825e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-04-23 Andrew Haley * defineclass.cc (MAJOR_1_7, MINOR_1_7): New. diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index eae363d067f..53d206bdcc9 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-01-01 Jakub Jelinek * gnu/java/rmi/registry/RegistryImpl.java (version): Update diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 5874086aa0c..21d0d5f755e 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -7592,7 +7592,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" @@ -11811,7 +11818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11814 "configure" +#line 11821 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11917,7 +11924,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11920 "configure" +#line 11927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23878,7 +23885,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23881 "configure" */ +/* #line 23888 "configure" */ package java.lang; public class Object @@ -23971,7 +23978,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 23974: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 23981: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -23999,7 +24006,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 24002 "configure" */ +/* [#]line 24009 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -24207,7 +24214,7 @@ if test "x${use_glibj_zip}" = xfalse || \ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24210 "configure" */ + /* #line 24217 "configure" */ public class Test { public static void main(String args) diff --git a/libjava/configure b/libjava/configure index 43fd51f03a3..655179a89af 100755 --- a/libjava/configure +++ b/libjava/configure @@ -8842,7 +8842,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" @@ -13358,7 +13365,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13361 "configure" +#line 13368 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13464,7 +13471,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13467 "configure" +#line 13474 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19457,7 +19464,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19460 "configure" +#line 19467 "configure" struct S { ~S(); }; void bar(); void foo() diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 9fb1cac7758..e7e1023e9ed 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-04-11 Manuel López-Ibáñez PR 24985 diff --git a/libmudflap/configure b/libmudflap/configure index f1c74a1f5ee..1a762025c48 100755 --- a/libmudflap/configure +++ b/libmudflap/configure @@ -6393,7 +6393,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" @@ -10607,7 +10614,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10610 "configure" +#line 10617 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10713,7 +10720,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10716 "configure" +#line 10723 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 704981d9c13..3946e654ca1 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-03-12 Rainer Orth * configure.ac (enable_objc_gc): Remove alpha*-dec-osf* handling. diff --git a/libobjc/configure b/libobjc/configure index 2807d7394f9..5028c28fba0 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -6072,7 +6072,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" @@ -10587,7 +10594,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10590 "configure" +#line 10597 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10693,7 +10700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10696 "configure" +#line 10703 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11464,7 +11471,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 11467 "configure" +#line 11474 "configure" @interface Frob @end @implementation Frob diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog index 96c61861f24..4c25e881327 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2011-11-21 Andreas Tobler * configure: Regenerate. diff --git a/libquadmath/configure b/libquadmath/configure index 9d979337d18..e5c3de65164 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -6264,7 +6264,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" @@ -10513,7 +10520,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10516 "configure" +#line 10523 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10619,7 +10626,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10622 "configure" +#line 10629 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libssp/ChangeLog b/libssp/ChangeLog index 308f6fa7c0a..16d4bf6a8b8 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2011-11-21 Andreas Tobler * configure: Regenerate. diff --git a/libssp/configure b/libssp/configure index bd3f5662c4b..eba09f01103 100755 --- a/libssp/configure +++ b/libssp/configure @@ -6401,7 +6401,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" @@ -10650,7 +10657,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10653 "configure" +#line 10660 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10756,7 +10763,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10759 "configure" +#line 10766 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 779d7c54249..8716d008134 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-05-15 Paolo Carlini PR libstdc++/53339 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index e0af9c8de6c..2da417e1458 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -7119,7 +7119,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" @@ -11497,7 +11504,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11500 "configure" +#line 11507 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11603,7 +11610,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11606 "configure" +#line 11613 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14961,7 +14968,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14964 "configure" +#line 14971 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15296,7 +15303,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15299 "configure" +#line 15306 "configure" int main() { typedef bool atomic_type; @@ -15331,7 +15338,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15334 "configure" +#line 15341 "configure" int main() { typedef short atomic_type; @@ -15366,7 +15373,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15369 "configure" +#line 15376 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15402,7 +15409,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15405 "configure" +#line 15412 "configure" int main() { typedef long long atomic_type; @@ -15481,7 +15488,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 15484 "configure" +#line 15491 "configure" int main() { _Decimal32 d1; @@ -15523,7 +15530,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15526 "configure" +#line 15533 "configure" template struct same { typedef T2 type; }; @@ -15557,7 +15564,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15560 "configure" +#line 15567 "configure" template struct same { typedef T2 type; }; diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index ad2be69f642..401884df694 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-02-22 Kai Tietz PR lto/50616 diff --git a/lto-plugin/configure b/lto-plugin/configure index 7f1ade113a1..bd7e75e5870 100755 --- a/lto-plugin/configure +++ b/lto-plugin/configure @@ -6060,7 +6060,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" @@ -10544,7 +10551,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10547 "configure" +#line 10554 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10650,7 +10657,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10653 "configure" +#line 10660 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 8cce45d3023..b2c00395077 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu + + * configure: Regenerated. + 2012-03-02 Matthias Klose * Imported zlib 1.2.5; merged local changes. diff --git a/zlib/configure b/zlib/configure index f7fe2b7bd51..478bef3f215 100755 --- a/zlib/configure +++ b/zlib/configure @@ -5869,7 +5869,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" @@ -10386,7 +10393,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10389 "configure" +#line 10396 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10492,7 +10499,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10495 "configure" +#line 10502 "configure" #include "confdefs.h" #if HAVE_DLFCN_H