aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@gcc.gnu.org>2014-06-19 09:16:34 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2014-06-19 09:16:34 +0200
commit7f6c4159bf807be2450ea3952ecb6ed7ea8e33d0 (patch)
treed7a03ca2513c1c3ab47867b5d0d5cf274a580a17 /gcc/fortran
parent29d0a43c96c6c9671c0fe8a05b8cfb2791d5d5cd (diff)
downloadgcc-7f6c4159bf807be2450ea3952ecb6ed7ea8e33d0.zip
gcc-7f6c4159bf807be2450ea3952ecb6ed7ea8e33d0.tar.gz
gcc-7f6c4159bf807be2450ea3952ecb6ed7ea8e33d0.tar.bz2
trans-intrinsic.c (conv_co_minmaxsum): Fix argument passing.
gcc/fortran/ 2014-06-19 Tobias Burnus <burnus@net-b.de> * trans-intrinsic.c (conv_co_minmaxsum): Fix argument passing. gcc/testsuite/ 2014-06-19 Tobias Burnus <burnus@net-b.de> * gfortran.dg/coarray/collectives_2.f90: Extend and make valid. libgfortran/ 2014-06-19 Tobias Burnus <burnus@net-b.de> * caf/single.c (_gfortran_caf_co_sum, _gfortran_caf_co_max, _gfortran_caf_co_min): Fix stat setting. From-SVN: r211816
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-intrinsic.c10
2 files changed, 9 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7b21c6e..903e9ab 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19 Tobias Burnus <burnus@net-b.de>
+
+ * trans-intrinsic.c (conv_co_minmaxsum): Fix argument
+ passing.
+
2014-06-18 Tobias Burnus <burnus@net-b.de>
* gfortran.texi (OpenMP): Update refs to OpenMP 4.0.
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 52a2788..548fd9f 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -8300,13 +8300,11 @@ conv_co_minmaxsum (gfc_code *code)
gcc_unreachable ();
if (code->resolved_isym->id == GFC_ISYM_CO_SUM)
- fndecl = build_call_expr_loc (input_location, fndecl, 6, array,
- null_pointer_node, image_index, stat, errmsg,
- errmsg_len);
+ fndecl = build_call_expr_loc (input_location, fndecl, 5, array,
+ image_index, stat, errmsg, errmsg_len);
else
- fndecl = build_call_expr_loc (input_location, fndecl, 7, array,
- null_pointer_node, image_index, stat, errmsg,
- strlen, errmsg_len);
+ fndecl = build_call_expr_loc (input_location, fndecl, 6, array, image_index,
+ stat, errmsg, strlen, errmsg_len);
gfc_add_expr_to_block (&block, fndecl);
gfc_add_block_to_block (&block, &post_block);