mpiunit.patch

diff --git script/mpiut.in script/mpiut.in
index 7b817b0..6dbf334 100644
--- script/mpiut.in
+++ script/mpiut.in
@@ -8,6 +8,6 @@ EXEC="exec_test"
 MPIUTFLAGS="-I${INSTDIR}/include -finstrument-functions -rdynamic"
 MPIUTLIBS="-L${INSTDIR}/lib -lmpiunit -lm"
 
-$CC $MPIUTFLAGS $MPIUTLIBS src/*.c test/*.c -o $EXEC
+$CC $MPIUTFLAGS src/*.c test/*.c -o $EXEC $MPIUTLIBS
 mpirun $* ./$EXEC
 rm -f *.o $EXEC
diff --git script/proclog.in script/proclog.in
index 9ab98ba..80ef032 100644
--- script/proclog.in
+++ script/proclog.in
@@ -9,6 +9,6 @@ EXEC="exec_test"
 PROCLOGFLAGS="-I${INSTDIR}/include"
 PROCLOGLIBS="-L${INSTDIR}/lib -ldatalog -lproclog -lm"
 
-$CC $PROCLOGFLAGS $PROCLOGLIBS src/*.c test/*.c -o $EXEC
+$CC $PROCLOGFLAGS src/*.c test/*.c -o $EXEC $PROCLOGLIBS
 $RUN $* ./$EXEC
 rm -f *.o $EXEC
diff --git script/procut.in script/procut.in
index 9be7b9e..d0e56f3 100644
--- script/procut.in
+++ script/procut.in
@@ -8,6 +8,6 @@ EXEC="exec_test"
 PROCUTFLAGS="-I${INSTDIR}/include"
 PROCUTLIBS="-L${INSTDIR}/lib -ldatareplay -lprocut -lm"
 
-$CC $PROCUTFLAGS $PROCUTLIBS src/*.c test/*.c -o $EXEC
+$CC $PROCUTFLAGS src/*.c test/*.c -o $EXEC $PROCUTLIBS
 ./$EXEC $*
 rm -f *.o $EXEC
diff --git share/Makefile.test.in share/Makefile.test.in
index 8ebefe4..07f28a0 100644
--- share/Makefile.test.in
+++ share/Makefile.test.in
@@ -10,16 +10,16 @@ PROCUTLIBS=-L${INSTDIR}/lib -ldatareplay -lprocut -lm
 RUNTEST = run-test
 
 mpiut:
-	@${CC} ${MPIUTFLAGS} ${MPIUTLIBS} ${SRC} ${TESTSRC} -o ${RUNTEST}
+	@${CC} ${MPIUTFLAGS} ${SRC} ${TESTSRC} -o ${RUNTEST} ${MPIUTLIBS}
 	@mpirun ${ARGV} ./${RUNTEST}
 	@rm -f ${RUNTEST} *.o *.so *~
 
 proclog:
-	@${CC} ${MPIUTFLAGS} ${PROCLOGLIBS} ${SRC} ${TESTSRC} -o ${RUNTEST}
+	@${CC} ${MPIUTFLAGS} ${SRC} ${TESTSRC} -o ${RUNTEST} ${PROCLOGLIBS}
 	@mpirun ${ARGV} ./${RUNTEST}
 	@rm -f ${RUNTEST} *.o *.so *~
 
 procut:
-	@${CC} ${MPIUTFLAGS} ${PROCUTLIBS} ${SRC} ${TESTSRC} -o ${RUNTEST}
+	@${CC} ${MPIUTFLAGS} ${SRC} ${TESTSRC} -o ${RUNTEST} ${PROCUTLIBS}
 	./${RUNTEST}
 	@rm -f ${RUNTEST} *.o *.so *~
diff --git src/datareplay/log_coll.c src/datareplay/log_coll.c
index c73efa4..42d7700 100644
--- src/datareplay/log_coll.c
+++ src/datareplay/log_coll.c
@@ -22,7 +22,7 @@ MPI_Bcast(void* buf, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Scatter(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
+MPI_Scatter(const void* sendbuf, int sendcnt, MPI_Datatype sendtype,
             void* recvbuf, int recvcnt, MPI_Datatype recvtype,
             int root, MPI_Comm comm)
 {
@@ -40,7 +40,7 @@ MPI_Scatter(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
 }
 
 int
-MPI_Gather(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
+MPI_Gather(const void* sendbuf, int sendcnt, MPI_Datatype sendtype,
            void* recvbuf, int recvcnt, MPI_Datatype recvtype,
            int root, MPI_Comm comm)
 {
@@ -58,7 +58,7 @@ MPI_Gather(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
 }
 
 int
-MPI_Reduce(void* operand, void* result, int count, MPI_Datatype datatype,
+MPI_Reduce(const void* operand, void* result, int count, MPI_Datatype datatype,
            MPI_Op operator, int root, MPI_Comm comm)
 {
   int ret, size;
@@ -74,7 +74,7 @@ MPI_Reduce(void* operand, void* result, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Allreduce(void* operand, void* result, int count,
+MPI_Allreduce(const void* operand, void* result, int count,
               MPI_Datatype datatype, MPI_Op operator, MPI_Comm comm)
 {
   int ret, size;
diff --git src/datareplay/log_context.c src/datareplay/log_context.c
index e8d6f1d..f7c8574 100644
--- src/datareplay/log_context.c
+++ src/datareplay/log_context.c
@@ -34,8 +34,8 @@ MPI_Comm_rank(MPI_Comm comm, int* rank)
 }
 
 int
-MPI_Cart_create(MPI_Comm oldcomm, int ndims, int dimsizes[],
-                int wraparound[], int reorder, MPI_Comm* cart)
+MPI_Cart_create(MPI_Comm oldcomm, int ndims, const int dimsizes[],
+                const int wraparound[], int reorder, MPI_Comm* cart)
 {
   int ret;
 
diff --git src/datareplay/log_pt2pt.c src/datareplay/log_pt2pt.c
index a1c9b34..e7ba50a 100644
--- src/datareplay/log_pt2pt.c
+++ src/datareplay/log_pt2pt.c
@@ -7,7 +7,7 @@
 #include <log_common.h>
 
 int
-MPI_Send(void* buf, int count, MPI_Datatype datatype,
+MPI_Send(const void* buf, int count, MPI_Datatype datatype,
          int dest, int tag, MPI_Comm comm)
 {
   int ret;
@@ -36,7 +36,7 @@ MPI_Recv(void* buf, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Isend(void* buf, int count, MPI_Datatype datatype, int dest,
+MPI_Isend(const void* buf, int count, MPI_Datatype datatype, int dest,
           int tag, MPI_Comm comm, MPI_Request* req)
 {
   int ret;
diff --git src/datareplay/replay_coll.c src/datareplay/replay_coll.c
index 307e847..a8fc684 100644
--- src/datareplay/replay_coll.c
+++ src/datareplay/replay_coll.c
@@ -20,7 +20,7 @@ MPI_Bcast(void* buf, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Scatter(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
+MPI_Scatter(const void* sendbuf, int sendcnt, MPI_Datatype sendtype,
             void* recvbuf, int recvcnt, MPI_Datatype recvtype,
             int root, MPI_Comm comm)
 {
@@ -34,7 +34,7 @@ MPI_Scatter(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
 }
 
 int
-MPI_Gather(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
+MPI_Gather(const void* sendbuf, int sendcnt, MPI_Datatype sendtype,
            void* recvbuf, int recvcnt, MPI_Datatype recvtype,
            int root, MPI_Comm comm)
 {
@@ -48,7 +48,7 @@ MPI_Gather(void* sendbuf, int sendcnt, MPI_Datatype sendtype,
 }
 
 int
-MPI_Reduce(void* operand, void* result, int count, MPI_Datatype datatype,
+MPI_Reduce(const void* operand, void* result, int count, MPI_Datatype datatype,
            MPI_Op operator, int root, MPI_Comm comm)
 {
   int ret, size;
@@ -61,7 +61,7 @@ MPI_Reduce(void* operand, void* result, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Allreduce(void* operand, void* result, int count,
+MPI_Allreduce(const void* operand, void* result, int count,
               MPI_Datatype datatype, MPI_Op operator, MPI_Comm comm)
 {
   int ret, size;
diff --git src/datareplay/replay_context.c src/datareplay/replay_context.c
index d0050d6..b82eb47 100644
--- src/datareplay/replay_context.c
+++ src/datareplay/replay_context.c
@@ -29,8 +29,8 @@ MPI_Comm_rank(MPI_Comm comm, int* rank)
 }
 
 int
-MPI_Cart_create(MPI_Comm oldcomm, int ndims, int dimsizes[],
-                int wraparound[], int reorder, MPI_Comm* cart)
+MPI_Cart_create(MPI_Comm oldcomm, int ndims, const int dimsizes[],
+                const int wraparound[], int reorder, MPI_Comm* cart)
 {
   int ret;
 
diff --git src/datareplay/replay_pt2pt.c src/datareplay/replay_pt2pt.c
index d14eb69..da69e32 100644
--- src/datareplay/replay_pt2pt.c
+++ src/datareplay/replay_pt2pt.c
@@ -7,7 +7,7 @@
 #include <replay_common.h>
 
 int
-MPI_Send(void *buf, int count, MPI_Datatype datatype,
+MPI_Send(const void *buf, int count, MPI_Datatype datatype,
          int dest, int tag, MPI_Comm comm)
 {
   int ret;
@@ -33,7 +33,7 @@ MPI_Recv(void *buf, int count, MPI_Datatype datatype,
 }
 
 int
-MPI_Isend(void* buf, int count, MPI_Datatype datatype, int dest,
+MPI_Isend(const void* buf, int count, MPI_Datatype datatype, int dest,
           int tag, MPI_Comm comm, MPI_Request* req)
 {
   int ret;