[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-158-ge961180

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  e96118089e83a118a93b2ffdfa872015ab091291 (commit)
       via  2b829d4ac7c2a9a93af2a8d537cbc37d21ed6ef8 (commit)
      from  7b6824bf2e565f30bd147a3f72a9c6c66075615a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/e96118089e83a118a93b2ffdfa872015ab091291

commit e96118089e83a118a93b2ffdfa872015ab091291
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Sun Jan 12 21:18:31 2014 -0600

    Add -lgcov to LIBS when --enable-coverage
    
    When mpich is configured with ./configure --enable-coverage ..., we put
    -fprofile-arcs -ftest-coverage to CXXFLAGS. According to gcc manual,
    -fprofile-arcs -ftest-coverage can be replaced by --coverage. But unfortunately,
    I found though both add -lgcov when linking libmpichcxx.so, -lgcov is put to the
    end of the link command, which is too late.
    
    Adding -lgcov directly to LIBS will put -lgcov before -lc, which makes
    the linker correctly resolve symbol 'atexit' in linking.
    
    Fixes #2000
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/confdb/aclocal_coverage.m4 b/confdb/aclocal_coverage.m4
index 9e1659a..ce949d4 100644
--- a/confdb/aclocal_coverage.m4
+++ b/confdb/aclocal_coverage.m4
@@ -25,6 +25,7 @@ AC_ARG_ENABLE([coverage],
 if test "$enable_coverage" = "yes" ; then
     if test "$ac_cv_prog_gcc" = "yes" ; then
         CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+        LIBS="$LIBS -lgcov"
         if test ${WRAPPER_CFLAGS+set} = set ; then
             WRAPPER_CFLAGS="$WRAPPER_CFLAGS -fprofile-arcs -ftest-coverage"
         fi
@@ -34,6 +35,7 @@ if test "$enable_coverage" = "yes" ; then
     if test "$enable_cxx" = "yes" ; then
         if test "$ac_cv_cxx_compiler_gnu" = "yes" ; then
             CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+            LIBS="$LIBS -lgcov"
             if test ${WRAPPER_CXXFLAGS+set} = set ; then
                 WRAPPER_CXXFLAGS="$WRAPPER_CXXFLAGS -fprofile-arcs -ftest-coverage"
             fi
@@ -46,6 +48,7 @@ if test "$enable_coverage" = "yes" ; then
     if test "$enable_f77" = yes ; then
         if test "$ac_cv_f77_compiler_gnu" = "yes" ; then
              FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
+             LIBS="$LIBS -lgcov"
              if test ${WRAPPER_FFLAGS+set} = set ; then
                  WRAPPER_FFLAGS="$WRAPPER_FFLAGS -fprofile-arcs -ftest-coverage"
              fi
@@ -56,6 +59,7 @@ if test "$enable_coverage" = "yes" ; then
     if test "$enable_fc" = yes ; then
         if test "$ac_cv_fc_compiler_gnu" = "yes" ; then
              FCFLAGS="$FCFLAGS -fprofile-arcs -ftest-coverage"
+             LIBS="$LIBS -lgcov"
              if test ${WRAPPER_FCFLAGS+set} = set ; then
                  WRAPPER_FCFLAGS="$WRAPPER_FCFLAGS -fprofile-arcs -ftest-coverage"
              fi

http://git.mpich.org/mpich.git/commitdiff/2b829d4ac7c2a9a93af2a8d537cbc37d21ed6ef8

commit 2b829d4ac7c2a9a93af2a8d537cbc37d21ed6ef8
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Sun Jan 12 15:46:36 2014 -0600

    Add return 0 to the main function of tests
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/test/mpi/pt2pt/big_count_status.c b/test/mpi/pt2pt/big_count_status.c
index 3b93109..a8b9b67 100644
--- a/test/mpi/pt2pt/big_count_status.c
+++ b/test/mpi/pt2pt/big_count_status.c
@@ -48,4 +48,5 @@ int main(int argc, char **argv)
         printf(" No Errors\n");
     }
     MPI_Finalize();
+    return 0;
 }
diff --git a/test/mpi/threads/pt2pt/ibsend.c b/test/mpi/threads/pt2pt/ibsend.c
index c21fd69..a54d591 100644
--- a/test/mpi/threads/pt2pt/ibsend.c
+++ b/test/mpi/threads/pt2pt/ibsend.c
@@ -153,4 +153,5 @@ int main(int argc, char *argv[])
     MPI_Buffer_detach(&ptr_dt, &bs);
     free(buffer);
     MPI_Finalize();
+    return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 confdb/aclocal_coverage.m4        |    4 ++++
 test/mpi/pt2pt/big_count_status.c |    1 +
 test/mpi/threads/pt2pt/ibsend.c   |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
MPICH primary repository