diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-04-30 21:02:23 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-04-30 21:02:23 +0200 |
| commit | a8a5f4a9721cba832bf734c4be40d4a3f523d031 (patch) | |
| tree | 2ffac560d70a10f75cbb96e29d94316c0dbbaef1 /gcc/fortran/trans-stmt.c | |
| parent | 7f36b65d25e6882ac20d6baf80dd8f2c773aa7d7 (diff) | |
| download | gcc-a8a5f4a9721cba832bf734c4be40d4a3f523d031.zip gcc-a8a5f4a9721cba832bf734c4be40d4a3f523d031.tar.gz gcc-a8a5f4a9721cba832bf734c4be40d4a3f523d031.tar.bz2 | |
gfortran.h (gfc_init_coarray_decl): Remove.
2014-04-30 Tobias Burnus <burnus@net-b.de>
* gfortran.h (gfc_init_coarray_decl): Remove.
* parse.c (translate_all_program_units): Remove call to it.
(gfc_parse_file): Update call.
* trans.h (gfor_fndecl_caf_this_image,
gfor_fndecl_caf_num_images): Add.
(gfort_gvar_caf_num_images,
gfort_gvar_caf_this_image): Remove.
* trans-decl.c (gfor_fndecl_caf_this_image,
gfor_fndecl_caf_num_images): Add.
(gfort_gvar_caf_num_images,
gfort_gvar_caf_this_image): Remove.
(gfc_build_builtin_function_decls): Init new decl.
(gfc_init_coarray_dec): Remove.
(create_main_function): Change calls.
* trans-intrinsic.c (trans_this_image, trans_image_index,
conv_intrinsic_cobound): Generate call to new library function
instead of to a static variable.
* trans-stmt.c (gfc_trans_sync): Ditto.
2014-04-30 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/coarray_lib_this_image_1.f90: New.
* gfortran.dg/coarray_lib_this_image_2.f90: New.
2014-04-30 Tobias Burnus <burnus@net-b.de>
* caf/libcaf.h (_gfortran_caf_this_image,
* _gfortran_caf_num_images):
New prototypes.
(_gfortran_caf_init): Change prototype.
(mpi_token_t): New typedef.
(TOKEN): New define.
* caf/mpi.c (_gfortran_caf_this_image,
* _gfortran_caf_num_images):
New functions.
(_gfortran_caf_init): Update.
(_gfortran_caf_finalize, _gfortran_caf_register,
_gfortran_caf_deregister): Use mpi_token_t.
* caf/single.c (_gfortran_caf_this_image,
* _gfortran_caf_num_images):
New functions.
(_gfortran_caf_init): Update.
(_gfortran_caf_finalize, _gfortran_caf_register,
_gfortran_caf_deregister): Use mpi_token_t, simplify.
From-SVN: r209951
Diffstat (limited to 'gcc/fortran/trans-stmt.c')
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 00c99fc..212a258 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -784,8 +784,11 @@ gfc_trans_sync (gfc_code *code, gfc_exec_op type) else { tree cond2; + tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_num_images, + 2, integer_zero_node, + build_int_cst (integer_type_node, -1)); cond = fold_build2_loc (input_location, GT_EXPR, boolean_type_node, - images, gfort_gvar_caf_num_images); + images, tmp); cond2 = fold_build2_loc (input_location, LT_EXPR, boolean_type_node, images, build_int_cst (TREE_TYPE (images), 1)); |