[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-135-gb0dcf8c
Service Account
noreply at mpich.org
Wed Feb 4 14:20:37 CST 2015
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 b0dcf8cde20879b39ae1edfe1deb544f70c06147 (commit)
from 1260f270d6f51971e52da8e83c535bd7d2901c6e (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/b0dcf8cde20879b39ae1edfe1deb544f70c06147
commit b0dcf8cde20879b39ae1edfe1deb544f70c06147
Author: Wesley Bland <wbland at anl.gov>
Date: Wed Feb 4 13:25:34 2015 -0600
Add weak symbols for MPIX functions
Some of the MPIX functions did not have weak symbols set up correctly
which causes problems on some compilers (Pathscale). This patch adds the
correct attribute for all of them that were missing.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c
index e0b47d7..e3594f2 100644
--- a/src/mpi/comm/comm_agree.c
+++ b/src/mpi/comm/comm_agree.c
@@ -15,6 +15,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Comm_agree MPIX_Comm_agree
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Comm_agree as PMPIX_Comm_agree
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Comm_agree(MPI_Comm comm, int *flag) __attribute__((weak,alias("PMPIX_Comm_agree")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mpi/comm/comm_failure_ack.c b/src/mpi/comm/comm_failure_ack.c
index 4337eb3..14c929e 100644
--- a/src/mpi/comm/comm_failure_ack.c
+++ b/src/mpi/comm/comm_failure_ack.c
@@ -15,6 +15,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Comm_failure_ack MPIX_Comm_failure_ack
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Comm_failure_ack as PMPIX_Comm_failure_ack
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Comm_failure_ack( MPI_Comm comm ) __attribute__((weak,alias("PMPIX_Comm_failure_ack")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mpi/comm/comm_failure_get_acked.c b/src/mpi/comm/comm_failure_get_acked.c
index aac0c95..2289a89 100644
--- a/src/mpi/comm/comm_failure_get_acked.c
+++ b/src/mpi/comm/comm_failure_get_acked.c
@@ -15,6 +15,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Comm_failure_get_acked MPIX_Comm_failure_get_acked
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Comm_failure_get_acked as PMPIX_Comm_failure_get_acked
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Comm_failure_get_acked( MPI_Comm comm, MPI_Group *failedgrp ) __attribute__((weak,alias("PMPIX_Comm_failure_get_acked")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mpi/comm/comm_revoke.c b/src/mpi/comm/comm_revoke.c
index 7a5154f..d134e67 100644
--- a/src/mpi/comm/comm_revoke.c
+++ b/src/mpi/comm/comm_revoke.c
@@ -17,6 +17,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Comm_revoke MPIX_Comm_revoke
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Comm_revoke as PMPIX_Comm_revoke
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Comm_revoke(MPI_Comm comm) __attribute__((weak,alias("PMPIX_Comm_revoke")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c
index 0466db5..56536d7 100644
--- a/src/mpi/comm/comm_shrink.c
+++ b/src/mpi/comm/comm_shrink.c
@@ -29,6 +29,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Comm_shrink MPIX_Comm_shrink
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Comm_shrink as PMPIX_Comm_shrink
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias("PMPIX_Comm_shrink")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c
index 3bd9a77..5ec7075 100644
--- a/src/mpi/pt2pt/greq_start.c
+++ b/src/mpi/pt2pt/greq_start.c
@@ -230,6 +230,13 @@ int MPI_Grequest_start( MPI_Grequest_query_function *query_fn,
#pragma _HP_SECONDARY_DEF PMPIX_Grequest_class_create MPIX_Grequest_class_create
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Grequest_class_create as PMPIX_Grequest_class_create
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Grequest_class_create(MPI_Grequest_query_function *query_fn,
+ MPI_Grequest_free_function *free_fn,
+ MPI_Grequest_cancel_function *cancel_fn,
+ MPIX_Grequest_poll_function *poll_fn,
+ MPIX_Grequest_wait_function *wait_fn,
+ MPIX_Grequest_class *greq_class) __attribute__((weak,alias("MPIX_Grequest_class_create")));
#endif
/* -- End Profiling Symbol Block */
@@ -320,6 +327,8 @@ fn_fail:
#pragma _HP_SECONDARY_DEF PMPI_Grequest_class_allocate MPIX_Grequest_class_allocate
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Grequest_class_allocate as PMPIX_Grequest_class_allocate
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("MPIX_Grequest_class_allocate")));
#endif
/* -- End Profiling Symbol Block */
@@ -363,6 +372,14 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class,
#pragma _HP_SECONDARY_DEF PMPI_Grequest_start MPIX_Grequest_start
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Grequest_start as PMPIX_Grequest_start
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Grequest_start( MPI_Grequest_query_function *query_fn,
+ MPI_Grequest_free_function *free_fn,
+ MPI_Grequest_cancel_function *cancel_fn,
+ MPIX_Grequest_poll_function *poll_fn,
+ MPIX_Grequest_wait_function *wait_fn,
+ void *extra_state,
+ MPI_Request *request ) __attribute__((weak,alias("MPIX_Grequest_start")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mutex/mutex_create.c b/src/mutex/mutex_create.c
index 5bae747..eec39c1 100644
--- a/src/mutex/mutex_create.c
+++ b/src/mutex/mutex_create.c
@@ -22,6 +22,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Mutex_create MPIX_Mutex_create
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Mutex_create as PMPIX_Mutex_create
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("MPIX_Mutex_create")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mutex/mutex_free.c b/src/mutex/mutex_free.c
index 767c00b..79715ca 100644
--- a/src/mutex/mutex_free.c
+++ b/src/mutex/mutex_free.c
@@ -19,6 +19,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Mutex_free MPIX_Mutex_free
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Mutex_free as PMPIX_Mutex_free
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("MPIX_Mutex_free")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mutex/mutex_lock.c b/src/mutex/mutex_lock.c
index d6f9836..257e80f 100644
--- a/src/mutex/mutex_lock.c
+++ b/src/mutex/mutex_lock.c
@@ -20,6 +20,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Mutex_lock MPIX_Mutex_lock
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Mutex_lock as PMPIX_Mutex_lock
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_lock")));
#endif
/* -- End Profiling Symbol Block */
diff --git a/src/mutex/mutex_unlock.c b/src/mutex/mutex_unlock.c
index 5dd67d9..722f8b9 100644
--- a/src/mutex/mutex_unlock.c
+++ b/src/mutex/mutex_unlock.c
@@ -20,6 +20,8 @@
#pragma _HP_SECONDARY_DEF PMPIX_Mutex_unlock MPIX_Mutex_unlock
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Mutex_unlock as PMPIX_Mutex_unlock
+#elif defined(HAVE_WEAK_ATTRIBUTE)
+int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_unlock")));
#endif
/* -- End Profiling Symbol Block */
-----------------------------------------------------------------------
Summary of changes:
src/mpi/comm/comm_agree.c | 2 ++
src/mpi/comm/comm_failure_ack.c | 2 ++
src/mpi/comm/comm_failure_get_acked.c | 2 ++
src/mpi/comm/comm_revoke.c | 2 ++
src/mpi/comm/comm_shrink.c | 2 ++
src/mpi/pt2pt/greq_start.c | 17 +++++++++++++++++
src/mutex/mutex_create.c | 2 ++
src/mutex/mutex_free.c | 2 ++
src/mutex/mutex_lock.c | 2 ++
src/mutex/mutex_unlock.c | 2 ++
10 files changed, 35 insertions(+), 0 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list