Fixes for MPICH on amd64-linux.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6477

diff --git a/auxprogs/libmpiwrap.c b/auxprogs/libmpiwrap.c
index e8c49a397fbfea2fddcad4983855a490475ba2e6..c1e3773ba9fb5846b37dcc34dcdaf14ee8a4ef58 100644 (file)
--- a/auxprogs/libmpiwrap.c
+++ b/auxprogs/libmpiwrap.c
@@ -83,11 +83,14 @@
 #include "mpi.h"
 
 /* Where are API symbols?
-   Open MPI  lib/libmpi.so,  soname = libmpi.so.0
+   Open MPI      lib/libmpi.so,   soname = libmpi.so.0
+   Quadrics MPI  lib/libmpi.so,   soname = libmpi.so.0
+   MPICH         libmpich.so.1.0, soname = libmpich.so.1.0
    AIX: in /usr/lpp/ppe.poe/lib/libmpi_r.a(mpicore*_r.o)
-   ditto Quadrics MPI
+
+   For the non-AIX targets, a suitable soname to match with
+   is "libmpi*.so*".
 */
-/* ifdef OpenMPI ... */
 #if defined(_AIX)
 # define I_WRAP_FNNAME_U(_name) \
          I_WRAP_SONAME_FNNAME_ZU(libmpiZurZdaZLmpicoreZaZurZdoZR,_name)
@@ -95,7 +98,7 @@
      libmpiwrap.exp. */
 #else
 # define I_WRAP_FNNAME_U(_name) \
-         I_WRAP_SONAME_FNNAME_ZU(libmpiZdsoZa,_name)
+         I_WRAP_SONAME_FNNAME_ZU(libmpiZaZdsoZa,_name)
 
 #endif
 
@@ -521,7 +524,7 @@ void walk_type ( void(*f)(void*,long), char* base, MPI_Datatype ty )
    MPI_Datatype* dtys  = NULL;
 
    if (0)
-      printf("walk_type %p\n", (void*)ty);
+      printf("walk_type %p\n", (void*)(unsigned long)ty);
 
    r = PMPI_Type_get_envelope( ty, &n_ints, &n_addrs, &n_dtys, &tycon );
    assert(r == MPI_SUCCESS);