Index: libtool.m4 |
diff --git a/libtool.m4 b/libtool.m4 |
index 71bcee83c872d0f108dc32d887c629ea5b3274cf..797468f02a5a03d2a37945e9473a5d2d8082b459 100644 |
--- a/libtool.m4 |
+++ b/libtool.m4 |
@@ -1220,7 +1220,7 @@ ia64-*-hpux*) |
rm -rf conftest* |
;; |
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
# Find out which ABI we are using. |
echo 'int i;' > conftest.$ac_ext |
@@ -1232,9 +1232,19 @@ 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*) |
+ powerpc64le-*linux*) |
+ LD="${LD-ld} -m elf32lppclinux" |
+ ;; |
+ powerpc64-*linux*) |
LD="${LD-ld} -m elf32ppclinux" |
;; |
s390x-*linux*) |
@@ -1253,7 +1263,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
x86_64-*linux*) |
LD="${LD-ld} -m elf_x86_64" |
;; |
- ppc*-*linux*|powerpc*-*linux*) |
+ powerpcle-*linux*) |
+ LD="${LD-ld} -m elf64lppc" |
+ ;; |
+ powerpc-*linux*) |
LD="${LD-ld} -m elf64ppc" |
;; |
s390*-*linux*|s390*-*tpf*) |
@@ -2273,7 +2286,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 +2304,7 @@ freebsd* | dragonfly*) |
esac |
shlibpath_var=LD_LIBRARY_PATH |
case $host_os in |
- freebsd2*) |
+ freebsd2.*) |
shlibpath_overrides_runpath=yes |
;; |
freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
@@ -3573,6 +3586,7 @@ m4_if([$1], [CXX], [ |
# AIX 5 now supports IA64 processor |
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
fi |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
;; |
amigaos*) |
@@ -3884,6 +3898,7 @@ m4_if([$1], [CXX], [ |
# AIX 5 now supports IA64 processor |
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
fi |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
;; |
amigaos*) |
@@ -4804,7 +4819,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 +5766,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 |