fortran/use-mpi-f08: add CFI support for one sided operations

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

Author: ggouaillardet

ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90

@@ -17,7 +17,7 @@ subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_accumulate_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
    INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
    TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h.in

@@ -17,8 +17,8 @@ subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_compare_and_swap_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr, compare_addr
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr, compare_addr
+   OMPI_F08_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
    TYPE(MPI_Datatype), INTENT(IN) :: datatype
    INTEGER, INTENT(IN) :: target_rank
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90

@@ -16,8 +16,8 @@ subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_fetch_and_op_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
    TYPE(MPI_Datatype), INTENT(IN) :: datatype
    INTEGER, INTENT(IN) :: target_rank
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90

@@ -18,10 +18,10 @@ subroutine MPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_get_accumulate_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
    INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count
    TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
+   OMPI_F08_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: result_addr
    TYPE(MPI_Datatype), INTENT(IN) :: result_datatype
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
    TYPE(MPI_Datatype), INTENT(IN) :: target_datatype

ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90

@@ -16,7 +16,7 @@ subroutine MPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_get_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: origin_addr
    INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
    TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/get_f08.F90

@@ -3305,7 +3305,7 @@ end subroutine MPI_Unpublish_name_f08
 end interface  MPI_Unpublish_name
 
 interface  MPI_Accumulate
-subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,target_rank, &
+subroutine MPI_Accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
                               target_disp,target_count,target_datatype,op,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
    implicit none
@@ -3318,11 +3318,11 @@ subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,target_ra
    TYPE(MPI_Op), INTENT(IN) :: op
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Accumulate_f08
+end subroutine MPI_Accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Accumulate
 
 interface  MPI_Raccumulate
-subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,target_rank, &
+subroutine MPI_Raccumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
                                target_disp,target_count,target_datatype,op,win,request, &
                                ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
@@ -3337,12 +3337,12 @@ subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,target_r
    TYPE(MPI_Win), INTENT(IN) :: win
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Raccumulate_f08
+end subroutine MPI_Raccumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Raccumulate
 
 interface  MPI_Get
-subroutine MPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank, &
-                               target_disp,target_count,target_datatype,win,ierror)
+subroutine MPI_Get_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
+                       target_disp,target_count,target_datatype,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    implicit none
    @OMPI_F08_IGNORE_TKR_PREDECL@ origin_addr
@@ -3353,11 +3353,11 @@ subroutine MPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank, &
    TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Get_f08
+end subroutine MPI_Get_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Get
 
 interface  MPI_Rget
-subroutine MPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank, &
+subroutine MPI_Rget_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
                         target_disp,target_count,target_datatype,win,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Request, MPI_Win, MPI_ADDRESS_KIND
    implicit none
@@ -3370,11 +3370,11 @@ subroutine MPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank, &
    TYPE(MPI_Win), INTENT(IN) :: win
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Rget_f08
+end subroutine MPI_Rget_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Rget
 
 interface  MPI_Get_accumulate
-subroutine MPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,result_addr, &
+subroutine MPI_Get_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,result_addr, &
                                   result_count,result_datatype,target_rank,target_disp, &
                                   target_count,target_datatype,op,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
@@ -3390,11 +3390,11 @@ subroutine MPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,resul
    TYPE(MPI_Op), INTENT(IN) :: op
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Get_accumulate_f08
+end subroutine MPI_Get_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Get_accumulate
 
 interface  MPI_Rget_accumulate
-subroutine MPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,result_addr, &
+subroutine MPI_Rget_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,result_addr, &
                                    result_count,result_datatype,target_rank,target_disp, &
                                    target_count,target_datatype,op,win,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Request, MPI_Win, MPI_ADDRESS_KIND
@@ -3411,12 +3411,12 @@ subroutine MPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,resu
    TYPE(MPI_Win), INTENT(IN) :: win
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Rget_accumulate_f08
+end subroutine MPI_Rget_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Rget_accumulate
 
 interface  MPI_Put
-subroutine MPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank, &
-                               target_disp,target_count,target_datatype,win,ierror)
+subroutine MPI_Put_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
+                       target_disp,target_count,target_datatype,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    implicit none
    @OMPI_F08_IGNORE_TKR_PREDECL@ origin_addr
@@ -3427,11 +3427,11 @@ subroutine MPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank, &
    TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Put_f08
+end subroutine MPI_Put_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Put
 
 interface  MPI_Rput
-subroutine MPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank, &
+subroutine MPI_Rput_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,origin_count,origin_datatype,target_rank, &
                         target_disp,target_count,target_datatype,win,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
    implicit none
@@ -3444,11 +3444,11 @@ subroutine MPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank, &
    TYPE(MPI_Win), INTENT(IN) :: win
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Rput_f08
+end subroutine MPI_Rput_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Rput
 
 interface  MPI_Fetch_and_op
-subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
+subroutine MPI_Fetch_and_op_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,result_addr,datatype,target_rank, &
                                 target_disp,op,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
    implicit none
@@ -3461,11 +3461,11 @@ subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
    TYPE(MPI_Op), INTENT(IN) :: op
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Fetch_and_op_f08
+end subroutine MPI_Fetch_and_op_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Fetch_and_op
 
 interface  MPI_Compare_and_swap
-subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,datatype, &
+subroutine MPI_Compare_and_swap_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(origin_addr,compare_addr,result_addr,datatype, &
                                     target_rank,target_disp,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    implicit none
@@ -3477,7 +3477,7 @@ subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,datatyp
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Compare_and_swap_f08
+end subroutine MPI_Compare_and_swap_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Compare_and_swap
 
 interface  MPI_Win_complete
@@ -3490,7 +3490,7 @@ end subroutine MPI_Win_complete_f08
 end interface  MPI_Win_complete
 
 interface  MPI_Win_create
-subroutine MPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror)
+subroutine MPI_Win_create_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(base,size,disp_unit,info,comm,win,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND
    implicit none
    @OMPI_F08_IGNORE_TKR_PREDECL@ base
@@ -3501,7 +3501,7 @@ subroutine MPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror)
    TYPE(MPI_Comm), INTENT(IN) :: comm
    TYPE(MPI_Win), INTENT(OUT) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Win_create_f08
+end subroutine MPI_Win_create_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Win_create
 
 interface  MPI_Win_create_dynamic
@@ -3516,26 +3516,26 @@ end subroutine MPI_Win_create_dynamic_f08
 end interface  MPI_Win_create_dynamic
 
 interface  MPI_Win_attach
-subroutine MPI_Win_attach_f08(win,base,size,ierror)
+subroutine MPI_Win_attach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(win,base,size,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    implicit none
    @OMPI_F08_IGNORE_TKR_PREDECL@ base
    @OMPI_F08_IGNORE_TKR_TYPE@ OMPI_ASYNCHRONOUS :: base
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Win_attach_f08
+end subroutine MPI_Win_attach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Win_attach
 
 interface  MPI_Win_detach
-subroutine MPI_Win_detach_f08(win,base,ierror)
+subroutine MPI_Win_detach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(win,base,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    implicit none
    @OMPI_F08_IGNORE_TKR_PREDECL@ base
    @OMPI_F08_IGNORE_TKR_TYPE@ OMPI_ASYNCHRONOUS :: base
    TYPE(MPI_Win), INTENT(IN) :: win
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Win_detach_f08
+end subroutine MPI_Win_detach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Win_detach
 
 interface  MPI_Win_fence

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.h.in

@@ -603,35 +603,48 @@
 #define MPI_Unpublish_name PMPI_Unpublish_name
 #define MPI_Unpublish_name_f08 PMPI_Unpublish_name_f08
 #define MPI_Accumulate PMPI_Accumulate
-#define MPI_Accumulate_f08 PMPI_Accumulate_f08
+#define MPI_Accumulate_f08 PMPI_Accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Accumulate_f08ts PMPI_Accumulate_f08ts
 #define MPI_Raccumulate PMPI_Raccumulate
-#define MPI_Raccumulate_f08 PMPI_Raccumulate_f08
+#define MPI_Raccumulate_f08 PMPI_Raccumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Raccumulate_f08ts PMPI_Raccumulate_f08ts
 #define MPI_Get PMPI_Get
-#define MPI_Get_f08 PMPI_Get_f08
+#define MPI_Get_f08 PMPI_Get_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Get_f08ts PMPI_Get_f08ts
 #define MPI_Rget PMPI_Rget
-#define MPI_Rget_f08 PMPI_Rget_f08
+#define MPI_Rget_f08 PMPI_Rget_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rget_f08ts PMPI_Rget_f08ts
 #define MPI_Get_accumulate PMPI_Get_accumulate
-#define MPI_Get_accumulate_f08 PMPI_Get_accumulate_f08
+#define MPI_Get_accumulate_f08 PMPI_Get_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Get_accumulate_f08ts PMPI_Get_accumulate_f08ts
 #define MPI_Rget_accumulate PMPI_Rget_accumulate
-#define MPI_Rget_accumulate_f08 PMPI_Rget_accumulate_f08
+#define MPI_Rget_accumulate_f08 PMPI_Rget_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rget_accumulate_f08ts PMPI_Rget_accumulate_f08ts
 #define MPI_Put PMPI_Put
-#define MPI_Put_f08 PMPI_Put_f08
+#define MPI_Put_f08 PMPI_Put_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Put_f08ts PMPI_Put_f08ts
 #define MPI_Rput PMPI_Rput
-#define MPI_Rput_f08 PMPI_Rput_f08
+#define MPI_Rput_f08 PMPI_Rput_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rput_f08ts PMPI_Rput_f08ts
 #define MPI_Fetch_and_op PMPI_Fetch_and_op
-#define MPI_Fetch_and_op_f08 PMPI_Fetch_and_op_f08
+#define MPI_Fetch_and_op_f08 PMPI_Fetch_and_op_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Fetch_and_op_f08ts PMPI_Fetch_and_op_f08ts
 #define MPI_Compare_and_swap PMPI_Compare_and_swap
-#define MPI_Compare_and_swap_f08 PMPI_Compare_and_swap_f08
+#define MPI_Compare_and_swap_f08 PMPI_Compare_and_swap_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Compare_and_swap_f08ts PMPI_Compare_and_swap_f08ts
 #define MPI_Win_complete PMPI_Win_complete
 #define MPI_Win_complete_f08 PMPI_Win_complete_f08
 #define MPI_Win_create PMPI_Win_create
-#define MPI_Win_create_f08 PMPI_Win_create_f08
+#define MPI_Win_create_f08 PMPI_Win_create_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_create_f08ts PMPI_Win_create_f08ts
 #define MPI_Win_create_dynamic PMPI_Win_create_dynamic
 #define MPI_Win_create_dynamic_f08 PMPI_Win_create_dynamic_f08
 #define MPI_Win_attach PMPI_Win_attach
-#define MPI_Win_attach_f08 PMPI_Win_attach_f08
+#define MPI_Win_attach_f08 PMPI_Win_attach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_attach_f08ts PMPI_Win_attach_f08ts
 #define MPI_Win_detach PMPI_Win_detach
-#define MPI_Win_detach_f08 PMPI_Win_detach_f08
+#define MPI_Win_detach_f08 PMPI_Win_detach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_detach_f08ts PMPI_Win_detach_f08ts
 #define MPI_Win_fence PMPI_Win_fence
 #define MPI_Win_fence_f08 PMPI_Win_fence_f08
 #define MPI_Win_free PMPI_Win_free
@@ -925,6 +938,19 @@
 #define MPI_Scatterv_f08 MPI_Scatterv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Iscatterv_f08 MPI_Iscatterv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Free_mem_f08 MPI_Free_mem_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Accumulate_f08 MPI_Accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Raccumulate_f08 MPI_Raccumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Get_f08 MPI_Get_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rget_f08 MPI_Rget_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Get_accumulate_f08 MPI_Get_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rget_accumulate_f08 MPI_Rget_accumulate_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Put_f08 MPI_Put_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Rput_f08 MPI_Rput_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Fetch_and_op_f08 MPI_Fetch_and_op_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Compare_and_swap_f08 MPI_Compare_and_swap_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_create_f08 MPI_Win_create_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_attach_f08 MPI_Win_attach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Win_detach_f08 MPI_Win_detach_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_F_sync_reg_f08 MPI_F_sync_reg_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Imrecv_f08 MPI_Imrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Mrecv_f08 MPI_Mrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-rename.h.in

@@ -16,7 +16,7 @@ subroutine MPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_put_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
    INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
    TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

ompi/mpi/fortran/use-mpi-f08/put_f08.F90

@@ -17,7 +17,7 @@ subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,&
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_raccumulate_f
    implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
+   OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
    INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
    TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp