diff options
Diffstat (limited to 'libatomic')
| -rw-r--r-- | libatomic/ChangeLog | 4 | ||||
| -rwxr-xr-x | libatomic/configure | 13 |
2 files changed, 14 insertions, 3 deletions
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 <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2012-05-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 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 |