Index: m4/libtool.m4 |
diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
index 256661f4c2ad79f22cc0a2bb34feee4783d860ad..56666f0eceac29ace0fff6cfefa246a4ab93174c 100644 |
--- a/m4/libtool.m4 |
+++ b/m4/libtool.m4 |
@@ -1312,7 +1312,7 @@ ia64-*-hpux*) |
rm -rf conftest* |
;; |
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
# Find out which ABI we are using. |
echo 'int i;' > conftest.$ac_ext |
@@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
x86_64-*linux*) |
LD="${LD-ld} -m elf_i386" |
;; |
- powerpc64le-*linux*) |
- LD="${LD-ld} -m elf32lppclinux" |
- ;; |
- powerpc64-*linux*) |
+ ppc64-*linux*|powerpc64-*linux*) |
LD="${LD-ld} -m elf32ppclinux" |
;; |
s390x-*linux*) |
@@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
x86_64-*linux*) |
LD="${LD-ld} -m elf_x86_64" |
;; |
- powerpcle-*linux*) |
- LD="${LD-ld} -m elf64lppc" |
- ;; |
- powerpc-*linux*) |
+ ppc*-*linux*|powerpc*-*linux*) |
LD="${LD-ld} -m elf64ppc" |
;; |
s390*-*linux*|s390*-*tpf*) |
@@ -2675,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) |
# before this can be enabled. |
hardcode_into_libs=yes |
+ # Add ABI-specific directories to the system library path. |
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" |
+ |
# Append ld.so.conf contents to the search path |
if test -f /etc/ld.so.conf; then |
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
+ |
fi |
# We used to test for /lib/ld.so.1 and disable shared libraries on |