diff options
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog.gcj | 4 | ||||
| -rwxr-xr-x | zlib/configure | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 8cce45d..b2c0039 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2012-05-16 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2012-03-02 Matthias Klose <doko@ubuntu.com> * Imported zlib 1.2.5; merged local changes. diff --git a/zlib/configure b/zlib/configure index f7fe2b7..478bef3 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 |