|
From: <sv...@va...> - 2007-01-06 05:46:31
|
Author: sewardj
Date: 2007-01-06 05:46:30 +0000 (Sat, 06 Jan 2007)
New Revision: 6478
Log:
Merge r6477 (Fixes for MPICH on amd64-linux.)
Modified:
branches/VALGRIND_3_2_BRANCH/auxprogs/libmpiwrap.c
Modified: branches/VALGRIND_3_2_BRANCH/auxprogs/libmpiwrap.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/auxprogs/libmpiwrap.c 2007-01-06 05:28:2=
7 UTC (rev 6477)
+++ branches/VALGRIND_3_2_BRANCH/auxprogs/libmpiwrap.c 2007-01-06 05:46:3=
0 UTC (rev 6478)
@@ -83,14 +83,16 @@
#include "mpi.h"
=20
/* Where are API symbols?
- Open MPI lib/libmpi.so, soname =3D libmpi.so.0
- ditto Quadrics MPI
+ Open MPI lib/libmpi.so, soname =3D libmpi.so.0
+ Quadrics MPI lib/libmpi.so, soname =3D libmpi.so.0
+ MPICH libmpich.so.1.0, soname =3D libmpich.so.1.0
+
+ So a suitable soname to match with is "libmpi*.so*".
*/
/* ifdef OpenMPI ... */
-#define I_WRAP_FNNAME_U(_name) I_WRAP_SONAME_FNNAME_ZU(libmpiZdsoZa,_nam=
e)
+#define I_WRAP_FNNAME_U(_name) I_WRAP_SONAME_FNNAME_ZU(libmpiZaZdsoZa,_n=
ame)
=20
=20
-
/*------------------------------------------------------------*/
/*--- Decls ---*/
/*------------------------------------------------------------*/
@@ -508,7 +510,7 @@
MPI_Datatype* dtys =3D NULL;
=20
if (0)
- printf("walk_type %p\n", (void*)ty);
+ printf("walk_type %p\n", (void*)(unsigned long)ty);
=20
r =3D PMPI_Type_get_envelope( ty, &n_ints, &n_addrs, &n_dtys, &tycon =
);
assert(r =3D=3D MPI_SUCCESS);
|