Control: tags -1 + patch
Hello,
Sebastian Dröge, le sam. 07 déc. 2019 10:46:04 +0200, a ecrit:
> valgrind currently fails to build from source. The Ubuntu patch to drop MPI 1
> support (drop-MPI-1-support.patch) probably fixes this.
It doesn't seem to be needed to completely drop MPI-1 support, the
attached patch fixes the build too.
Samuel
---
mpi/libmpiwrap.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--- a/mpi/libmpiwrap.c
+++ b/mpi/libmpiwrap.c
@@ -278,8 +278,12 @@ static void showTy ( FILE* f, MPI_Dataty
else if (ty == MPI_LONG_INT) fprintf(f,"LONG_INT");
else if (ty == MPI_SHORT_INT) fprintf(f,"SHORT_INT");
else if (ty == MPI_2INT) fprintf(f,"2INT");
+# if defined(MPI_UB)
else if (ty == MPI_UB) fprintf(f,"UB");
+# endif
+# if defined(MPI_LB)
else if (ty == MPI_LB) fprintf(f,"LB");
+# endif
# if defined(MPI_WCHAR)
else if (ty == MPI_WCHAR) fprintf(f,"WCHAR");
# endif
@@ -733,8 +737,14 @@ void walk_type ( void(*f)(void*,long), c
f(base + offsetof(Ty,loc), sizeof(int));
return;
}
- if (ty == MPI_LB || ty == MPI_UB)
+#if defined(MPI_LB)
+ if (ty == MPI_LB)
+ return; /* have zero size, so nothing needs to be done */
+#endif
+#if defined(MPI_UB)
+ if (ty == MPI_UB)
return; /* have zero size, so nothing needs to be done */
+#endif
goto unhandled;
/*NOTREACHED*/
}
