From: Timothy Wall <twall@oculustech.com>
Date: Mon, 9 Jul 2001 19:19:24 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Don't disable shlibs
X-Git-Tag: release-1-4b~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03278d51cc2039b7ed4b14490af92614645362bb;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Don't disable shlibs
on AIX5/IA64 with GNU ld.  Keep gnu defaults if using gnu tools
on AIX5/IA64.
---

diff --git a/ChangeLog b/ChangeLog
index 60787f093..1d4c1641d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-09  Timothy Wall  <twall@oculustech.com>
+
+	* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Don't disable shlibs
+	on AIX5/IA64 with GNU ld.  Keep gnu defaults if using gnu tools
+	on AIX5/IA64.
+
 2001-07-09  Robert Boehne  <rboehne@ricardo-us.com>
 
 	* libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN):  Set max_cmd_len
diff --git a/libtool.m4 b/libtool.m4
index 007d013f4..cab8f2039 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3914,10 +3914,10 @@ if test "$with_gnu_ld" = yes; then
   # See if GNU ld supports shared libraries.
   case $host_os in
   aix3* | aix4* | aix5*)
-    # On AIX, the GNU linker is very broken
-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    cat <<EOF 1>&2
+    # On AIX/PPC, the GNU linker is very broken
+    if test "$host_cpu" != ia64; then
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      cat <<EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
@@ -3926,6 +3926,7 @@ if test "$with_gnu_ld" = yes; then
 *** so that a non-GNU linker is found, and then restart.
 
 EOF
+    fi
     ;;
 
   amigaos*)
@@ -4171,7 +4172,9 @@ else
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
       aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
+	if test $with_gnu_ld = no; then
+	  exp_sym_flag='-Bexport'
+	fi
       no_entry_flag=""
     else
       # Test if we are trying to use run time linking, or normal AIX style
@@ -4198,9 +4201,11 @@ else
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
     else
       if test "$host_cpu" = ia64; then
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	if test $with_gnu_ld = no; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	fi
       else
         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'