[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-57-g32ab060

[Service Account]

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  32ab0609d378603af93418f12aac645da8af727e (commit)
      from  4b35902a9704bb6ebdc1767d73d36443ca37fe73 (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/32ab0609d378603af93418f12aac645da8af727e

commit 32ab0609d378603af93418f12aac645da8af727e
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Tue Mar 18 23:11:43 2014 -0500

    Put weak symbols in #ifndef MPICH_MPI_FROM_PMPI
    
    Fixes #2044
    
    Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>

diff --git a/src/binding/f77/buildiface b/src/binding/f77/buildiface
index 0395a9c..ce278bc 100755
--- a/src/binding/f77/buildiface
+++ b/src/binding/f77/buildiface
@@ -5261,17 +5261,17 @@ sub HelperForRegister_datarep {
        Like the attribute null functions, we provide multiple weak versions
        of this if possible */
 
+#if defined(USE_WEAK_SYMBOLS)
+
 /* Add the prototype so the routine knows what this is */
 extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr );
 
-#if defined(USE_WEAK_SYMBOLS)
-
-#if defined(HAVE_MULTIPLE_PRAGMA_WEAK) /* If support multiple #pragma weak */
+#if defined(HAVE_MULTIPLE_PRAGMA_WEAK) && !defined(MPICH_MPI_FROM_PMPI) /* If support multiple #pragma weak */
 #pragma weak mpi_conversion_fn_null__ = mpi_conversion_fn_null_
 #pragma weak mpi_conversion_fn_null   = mpi_conversion_fn_null_
 #pragma weak MPI_CONVERSION_FN_NULL   = mpi_conversion_fn_null_
 
-#elif defined(HAVE_PRAGMA_WEAK) /* If support single #pragma weak */
+#elif defined(HAVE_PRAGMA_WEAK) && !defined(MPICH_MPI_FROM_PMPI) /* If support single #pragma weak */
 #if defined(F77_NAME_UPPER)
 #pragma weak MPI_CONVERSION_FN_NULL   = mpi_conversion_fn_null_
 #elif defined(F77_NAME_LOWER_2USCORE)
@@ -5280,7 +5280,7 @@ extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v
 #pragma weak mpi_conversion_fn_null   = mpi_conversion_fn_null_
 #endif
 
-#elif defined(HAVE_PRAGMA_HP_SEC_DEF) /* If support _HP_SECONDARY_DEF */
+#elif defined(HAVE_PRAGMA_HP_SEC_DEF) && !defined(MPICH_MPI_FROM_PMPI) /* If support _HP_SECONDARY_DEF */
 #if defined(F77_NAME_UPPER)
 #pragma _HP_SECONDARY_DEF MPI_CONVERSION_FN_NULL   = mpi_conversion_fn_null_
 #elif defined(F77_NAME_LOWER_2USCORE)
@@ -5289,7 +5289,7 @@ extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v
 #pragma _HP_SECONDARY_DEF mpi_conversion_fn_null  = mpi_conversion_fn_null_
 #endif
 
-#elif defined(HAVE_PRAGMA_CRI_DUP) /* If support _CRI duplicate */
+#elif defined(HAVE_PRAGMA_CRI_DUP) && !defined(MPICH_MPI_FROM_PMPI) /* If support _CRI duplicate */
 #if defined(F77_NAME_UPPER)
 #pragma _CRI duplicate MPI_CONVERSION_FN_NULL as mpi_conversion_fn_null_
 #elif defined(F77_NAME_LOWER_2USCORE)
@@ -5314,6 +5314,8 @@ extern FORT_DLL_SPEC int FORT_CALL MPI_CONVERSION_FN_NULL ( void*v1, MPI_Fint*v2
 MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\")
 #endif
 ;
+#endif
+
 #else /* No weak symbol support, so simply rename the one version to match the
          Fortran naming convention */
 #ifdef F77_NAME_UPPER
@@ -5325,14 +5327,17 @@ MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\")
 /* Else leave name alone */
 #endif /* End of test on name mapping without weak symbol support */
 
-#endif /* End of test on use weak symbols */
+/* Add the prototype so the routine knows what this is */
+extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr );
 
 #endif
 
+#ifndef MPICH_MPI_FROM_PMPI
 /* This isn't a callable function */
 FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ) {
     return 0;
 }
+#endif
 
 ";
 

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

Summary of changes:
 src/binding/f77/buildiface |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
MPICH primary repository