Skip to content

Commit 3d6206c

Browse files
author
rhc54
committed
Merge pull request open-mpi#683 from kawashima-fj/pr/v1.10/fortran-weak-symbol-fix
fortran/mpif-h: Insert missing weak symbols & Fix incorrect symbol names.
2 parents d41b6dd + 564919f commit 3d6206c

File tree

5 files changed

+30
-4
lines changed

5 files changed

+30
-4
lines changed

ompi/mpi/fortran/mpif-h/improbe_f.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
14+
* Copyright (c) 2015 FUJITSU LIMITED. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -30,6 +31,9 @@
3031
#pragma weak pmpi_improbe = ompi_improbe_f
3132
#pragma weak pmpi_improbe_ = ompi_improbe_f
3233
#pragma weak pmpi_improbe__ = ompi_improbe_f
34+
35+
#pragma weak PMPI_Improbe_f = ompi_improbe_f
36+
#pragma weak PMPI_Improbe_f08 = ompi_improbe_f
3337
#elif OMPI_PROFILE_LAYER
3438
OMPI_GENERATE_F77_BINDINGS (PMPI_IMPROBE,
3539
pmpi_improbe,
@@ -46,6 +50,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_IMPROBE,
4650
#pragma weak mpi_improbe = ompi_improbe_f
4751
#pragma weak mpi_improbe_ = ompi_improbe_f
4852
#pragma weak mpi_improbe__ = ompi_improbe_f
53+
54+
#pragma weak MPI_Improbe_f = ompi_improbe_f
55+
#pragma weak MPI_Improbe_f08 = ompi_improbe_f
4956
#endif
5057

5158
#if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER

ompi/mpi/fortran/mpif-h/imrecv_f.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2015 FUJITSU LIMITED. All rights reserved.
1314
* $COPYRIGHT$
1415
*
1516
* Additional copyrights may follow
@@ -27,6 +28,9 @@
2728
#pragma weak pmpi_imrecv = ompi_imrecv_f
2829
#pragma weak pmpi_imrecv_ = ompi_imrecv_f
2930
#pragma weak pmpi_imrecv__ = ompi_imrecv_f
31+
32+
#pragma weak PMPI_Imrecv_f = ompi_imrecv_f
33+
#pragma weak PMPI_Imrecv_f08 = ompi_imrecv_f
3034
#elif OMPI_PROFILE_LAYER
3135
OMPI_GENERATE_F77_BINDINGS (PMPI_IMRECV,
3236
pmpi_imrecv,
@@ -43,6 +47,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_IMRECV,
4347
#pragma weak mpi_imrecv = ompi_imrecv_f
4448
#pragma weak mpi_imrecv_ = ompi_imrecv_f
4549
#pragma weak mpi_imrecv__ = ompi_imrecv_f
50+
51+
#pragma weak MPI_Imrecv_f = ompi_imrecv_f
52+
#pragma weak MPI_Imrecv_f08 = ompi_imrecv_f
4653
#endif
4754

4855
#if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER

ompi/mpi/fortran/mpif-h/mprobe_f.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1313
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
15+
* Copyright (c) 2015 FUJITSU LIMITED. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -50,6 +51,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_MPROBE,
5051
#pragma weak mpi_mprobe = ompi_mprobe_f
5152
#pragma weak mpi_mprobe_ = ompi_mprobe_f
5253
#pragma weak mpi_mprobe__ = ompi_mprobe_f
54+
55+
#pragma weak MPI_Mprobe_f = ompi_mprobe_f
56+
#pragma weak MPI_Mprobe_f08 = ompi_mprobe_f
5357
#endif
5458

5559
#if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER

ompi/mpi/fortran/mpif-h/mrecv_f.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
14+
* Copyright (c) 2015 FUJITSU LIMITED. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -30,6 +31,9 @@
3031
#pragma weak pmpi_mrecv = ompi_mrecv_f
3132
#pragma weak pmpi_mrecv_ = ompi_mrecv_f
3233
#pragma weak pmpi_mrecv__ = ompi_mrecv_f
34+
35+
#pragma weak PMPI_Mrecv_f = ompi_mrecv_f
36+
#pragma weak PMPI_Mrecv_f08 = ompi_mrecv_f
3337
#elif OMPI_PROFILE_LAYER
3438
OMPI_GENERATE_F77_BINDINGS (PMPI_MRECV,
3539
pmpi_mrecv,
@@ -46,6 +50,9 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_MRECV,
4650
#pragma weak mpi_mrecv = ompi_mrecv_f
4751
#pragma weak mpi_mrecv_ = ompi_mrecv_f
4852
#pragma weak mpi_mrecv__ = ompi_mrecv_f
53+
54+
#pragma weak MPI_Mrecv_f = ompi_mrecv_f
55+
#pragma weak MPI_Mrecv_f08 = ompi_mrecv_f
4956
#endif
5057

5158
#if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER

ompi/mpi/fortran/mpif-h/rget_accumulate_f.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
1515
* reserved.
16+
* Copyright (c) 2015 FUJITSU LIMITED. All rights reserved.
1617
* $COPYRIGHT$
1718
*
1819
* Additional copyrights may follow
@@ -32,8 +33,8 @@
3233
#pragma weak pmpi_rget_accumulate_ = ompi_rget_accumulate_f
3334
#pragma weak pmpi_rget_accumulate__ = ompi_rget_accumulate_f
3435

35-
#pragma weak PMPI_Get_accumulate_f = ompi_rget_accumulate_f
36-
#pragma weak PMPI_Get_accumulate_f08 = ompi_rget_accumulate_f
36+
#pragma weak PMPI_Rget_accumulate_f = ompi_rget_accumulate_f
37+
#pragma weak PMPI_Rget_accumulate_f08 = ompi_rget_accumulate_f
3738
#elif OMPI_PROFILE_LAYER
3839
OMPI_GENERATE_F77_BINDINGS (PMPI_RGET_ACCUMULATE,
3940
pmpi_rget_accumulate,
@@ -50,8 +51,8 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_RGET_ACCUMULATE,
5051
#pragma weak mpi_rget_accumulate_ = ompi_rget_accumulate_f
5152
#pragma weak mpi_rget_accumulate__ = ompi_rget_accumulate_f
5253

53-
#pragma weak MPI_Get_accumulate_f = ompi_rget_accumulate_f
54-
#pragma weak MPI_Get_accumulate_f08 = ompi_rget_accumulate_f
54+
#pragma weak MPI_Rget_accumulate_f = ompi_rget_accumulate_f
55+
#pragma weak MPI_Rget_accumulate_f08 = ompi_rget_accumulate_f
5556
#endif
5657

5758
#if ! OPAL_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER

0 commit comments

Comments
 (0)