diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-08-26 14:09:07 +0000 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-08-26 14:09:07 +0000 |
commit | 612c0a30f8008106f59c017d711a68862239b041 (patch) | |
tree | d34e780e210a94dd2b15228bd16716681a27ee42 | |
parent | 06dbc802391fed1e18662056c49fcd4c8120e296 (diff) | |
download | gdb-612c0a30f8008106f59c017d711a68862239b041.tar.gz |
Sync libtool.m4 with GCC tree
2012-05-15 H.J. Lu <hongjiu.lu@intel.com>
Merge upstream change
* libtool.m4 (_LT_ENABLE_LOCK): Support x32.
2011-11-21 Andreas Tobler <andreast@fgznet.ch>
* libtool.m4: Additional FreeBSD 10 fixes.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | libtool.m4 | 17 |
2 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f4fbf7e8eab..b2c051923ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-05-15 H.J. Lu <hongjiu.lu@intel.com> + + Merge upstream change + * libtool.m4 (_LT_ENABLE_LOCK): Support x32. + +2011-11-21 Andreas Tobler <andreast@fgznet.ch> + + * libtool.m4: Additional FreeBSD 10 fixes. + 2012-06-28 Christophe Lyon <christophe.lyon@st.com> * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure diff --git a/libtool.m4 b/libtool.m4 index 71bcee83c87..a7f99ac7dbc 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1232,7 +1232,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" @@ -2273,7 +2280,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2291,7 +2298,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -4804,7 +4811,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5751,7 +5758,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no |