diff options
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog.libgcj | 4 | ||||
| -rwxr-xr-x | libffi/configure | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj index ea5d02f..21d7ccf 100644 --- a/libffi/ChangeLog.libgcj +++ b/libffi/ChangeLog.libgcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2004-01-14 Kelley Cook <kcook@gcc.gnu.org> * configure.in: Add in AC_PREREQ(2.13) diff --git a/libffi/configure b/libffi/configure index 1591495..28ed513 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 |