Re: better support for AIX 5.1

[Jim Edwards]

Here is a scaled back patch which adds ABI 64 support for AIX 4.3 and 
AIX5.  Includes some support for AIX5 which was already provided for 
AIX4 but had not included AIX5 and fixes a minor problem with the 
*undefined_flag .  

Jim

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libtool.m4,v
retrieving revision 1.323
diff -u -r1.323 libtool.m4
--- libtool.m4  3 Jun 2003 17:31:52 -0000       1.323
+++ libtool.m4  6 Jun 2003 19:28:12 -0000
@@ -2544,7 +2544,7 @@
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2830,8 +2830,8 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
        # Warning - without using the other run time loading flags,
        # -berok will link without error, but may produce a broken library.
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=',-bernotok'
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=',-berok'
        # -bexpall does not export symbols beginning with underscore (_)
        _LT_AC_TAGVAR(always_export_symbols, $1)=yes
        # Exported symbols can be pulled into shared objects from archives
@@ -3677,7 +3677,7 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
+aix4* | aix5*)
   test "$enable_shared" = yes && enable_static=no
   ;;
 esac
@@ -5280,8 +5280,8 @@
         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
          # Warning - without using the other run time loading flags,
          # -berok will link without error, but may produce a broken library.
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+         _LT_AC_TAGVAR(no_undefined_flag, $1)=',-bernotok'
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=',-berok'
          # -bexpall does not export symbols beginning with underscore (_)
          _LT_AC_TAGVAR(always_export_symbols, $1)=yes
          # Exported symbols can be pulled into shared objects from archives
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.339
diff -u -r1.339 ltmain.in
--- ltmain.in   3 Jun 2003 18:20:37 -0000       1.339
+++ ltmain.in   6 Jun 2003 19:28:13 -0000
@@ -1475,8 +1475,21 @@
          arg="\"$arg\""
          ;;
        esac
-       ;;
-
+        # Support for 32-bit and 64-bit ABI in AIX 5
+        # if the user specifies a particular ABI with a compiler flag
+        # use the AIX defined environment variable OBJECT_MODE to export that
+        # setting to NM and AR
+        case $host in
+          powerpc-*aix4.3* | powerpc-*aix5*)
+           if test "$arg" = -q64 ; then
+              export OBJECT_MODE=64 ;
+            else
+             if test "$arg" = -q32 ; then
+                export OBJECT_MODE=32 ;
+              fi
+            fi
+        esac
+        ;;
       *.$objext)
        # A standard object.
        objs="$objs $arg"