Index: m4/libtool.m4 |
diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
index 56666f0eceac29ace0fff6cfefa246a4ab93174c..d7c043f4f998971f1b81f7ab2c1e095fef45dee5 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*|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 |
@@ -1324,9 +1324,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 |
+ ;; |
+ powerpc64le-*) |
+ LD="${LD-ld} -m elf32lppclinux" |
;; |
- ppc64-*linux*|powerpc64-*linux*) |
+ powerpc64-*) |
LD="${LD-ld} -m elf32ppclinux" |
;; |
s390x-*linux*) |
@@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
x86_64-*linux*) |
LD="${LD-ld} -m elf_x86_64" |
;; |
- ppc*-*linux*|powerpc*-*linux*) |
+ powerpcle-*) |
+ LD="${LD-ld} -m elf64lppc" |
+ ;; |
+ powerpc-*) |
LD="${LD-ld} -m elf64ppc" |
;; |
s390*-*linux*|s390*-*tpf*) |
@@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl |
;; |
*) |
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
- if test -n "$lt_cv_sys_max_cmd_len"; then |
+ if test -n "$lt_cv_sys_max_cmd_len" && \ |
+ test undefined != "$lt_cv_sys_max_cmd_len"; then |
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
else |
@@ -2512,17 +2526,6 @@ freebsd* | dragonfly*) |
esac |
;; |
-gnu*) |
- version_type=linux # correct to gnu/linux during the next big refactor |
- need_lib_prefix=no |
- need_version=no |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
- soname_spec='${libname}${release}${shared_ext}$major' |
- shlibpath_var=LD_LIBRARY_PATH |
- shlibpath_overrides_runpath=no |
- hardcode_into_libs=yes |
- ;; |
- |
haiku*) |
version_type=linux # correct to gnu/linux during the next big refactor |
need_lib_prefix=no |
@@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) |
;; |
# This must be glibc/ELF. |
-linux* | k*bsd*-gnu | kopensolaris*-gnu) |
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
version_type=linux # correct to gnu/linux during the next big refactor |
need_lib_prefix=no |
need_version=no |
@@ -2669,14 +2672,10 @@ 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
- |
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
fi |
# We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -2688,6 +2687,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) |
dynamic_linker='GNU/Linux ld.so' |
;; |
+netbsdelf*-gnu) |
+ version_type=linux |
+ need_lib_prefix=no |
+ need_version=no |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
+ soname_spec='${libname}${release}${shared_ext}$major' |
+ shlibpath_var=LD_LIBRARY_PATH |
+ shlibpath_overrides_runpath=no |
+ hardcode_into_libs=yes |
+ dynamic_linker='NetBSD ld.elf_so' |
+ ;; |
+ |
netbsd*) |
version_type=sunos |
need_lib_prefix=no |
@@ -3247,10 +3258,6 @@ freebsd* | dragonfly*) |
fi |
;; |
-gnu*) |
- lt_cv_deplibs_check_method=pass_all |
- ;; |
- |
haiku*) |
lt_cv_deplibs_check_method=pass_all |
;; |
@@ -3289,11 +3296,11 @@ irix5* | irix6* | nonstopux*) |
;; |
# This must be glibc/ELF. |
-linux* | k*bsd*-gnu | kopensolaris*-gnu) |
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
lt_cv_deplibs_check_method=pass_all |
;; |
-netbsd*) |
+netbsd* | netbsdelf*-gnu) |
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
else |
@@ -4041,7 +4048,7 @@ m4_if([$1], [CXX], [ |
;; |
esac |
;; |
- linux* | k*bsd*-gnu | kopensolaris*-gnu) |
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
case $cc_basename in |
KCC*) |
# KAI C++ Compiler |
@@ -4105,7 +4112,7 @@ m4_if([$1], [CXX], [ |
;; |
esac |
;; |
- netbsd*) |
+ netbsd* | netbsdelf*-gnu) |
;; |
*qnx* | *nto*) |
# QNX uses GNU C++, but need to define -shared option too, otherwise |
@@ -4340,7 +4347,7 @@ m4_if([$1], [CXX], [ |
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
;; |
- linux* | k*bsd*-gnu | kopensolaris*-gnu) |
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
case $cc_basename in |
# old Intel for x86_64 which still supported -KPIC. |
ecc*) |
@@ -4582,6 +4589,9 @@ m4_if([$1], [CXX], [ |
;; |
esac |
;; |
+ linux* | k*bsd*-gnu | gnu*) |
+ _LT_TAGVAR(link_all_deplibs, $1)=no |
+ ;; |
*) |
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
;; |
@@ -4644,6 +4654,9 @@ dnl Note also adjust exclude_expsyms for C++ above. |
openbsd*) |
with_gnu_ld=no |
;; |
+ linux* | k*bsd*-gnu | gnu*) |
+ _LT_TAGVAR(link_all_deplibs, $1)=no |
+ ;; |
esac |
_LT_TAGVAR(ld_shlibs, $1)=yes |
@@ -4865,7 +4878,7 @@ _LT_EOF |
fi |
;; |
- netbsd*) |
+ netbsd* | netbsdelf*-gnu) |
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
wlarc= |
@@ -5042,6 +5055,7 @@ _LT_EOF |
if test "$aix_use_runtimelinking" = yes; then |
shared_flag="$shared_flag "'${wl}-G' |
fi |
+ _LT_TAGVAR(link_all_deplibs, $1)=no |
else |
# not using gcc |
if test "$host_cpu" = ia64; then |
@@ -5346,7 +5360,7 @@ _LT_EOF |
_LT_TAGVAR(link_all_deplibs, $1)=yes |
;; |
- netbsd*) |
+ netbsd* | netbsdelf*-gnu) |
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
else |
@@ -6226,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then |
_LT_TAGVAR(ld_shlibs, $1)=yes |
;; |
- gnu*) |
- ;; |
- |
haiku*) |
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
_LT_TAGVAR(link_all_deplibs, $1)=yes |
@@ -6390,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
_LT_TAGVAR(inherit_rpath, $1)=yes |
;; |
- linux* | k*bsd*-gnu | kopensolaris*-gnu) |
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
case $cc_basename in |
KCC*) |
# Kuck and Associates, Inc. (KAI) C++ Compiler |