aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-05-31 11:30:50 +0200
committerMartin Liska <mliska@suse.cz>2021-05-31 11:30:50 +0200
commit520839b3244507adc4f3ad640e5cab46e2ccbf8f (patch)
tree0d408f4e8cebbcbfa3115a907a162168b57bd65d /gcc/fortran
parent9104f3d64deca97a7698e9dde45010ca3cf75928 (diff)
parent21d7bba242f1a7349adc6a57aa4c874f7bb159f8 (diff)
downloadgcc-520839b3244507adc4f3ad640e5cab46e2ccbf8f.zip
gcc-520839b3244507adc4f3ad640e5cab46e2ccbf8f.tar.gz
gcc-520839b3244507adc4f3ad640e5cab46e2ccbf8f.tar.bz2
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog29
-rw-r--r--gcc/fortran/gfortran.texi2
2 files changed, 30 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d261101..95857cc 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,32 @@
+2021-05-30 Gerald Pfeifer <gerald@pfeifer.com>
+
+ * gfortran.texi (BOZ literal constants): Fix typo.
+
+2021-05-28 Tobias Burnus <tobias@codesourcery.com>
+
+ * dump-parse-tree.c (show_iterator): New.
+ (show_omp_namelist): Handle iterators.
+ (show_omp_clauses): Handle affinity.
+ * gfortran.h (gfc_free_omp_namelist): New union with 'udr' and new 'ns'.
+ * match.c (gfc_free_omp_namelist): Add are to choose union element.
+ * openmp.c (gfc_free_omp_clauses, gfc_match_omp_detach,
+ gfc_match_omp_clause_reduction, gfc_match_omp_flush): Update
+ call to gfc_free_omp_namelist.
+ (gfc_match_omp_variable_list): Likewise; permit preceeding whitespace.
+ (enum omp_mask1): Add OMP_CLAUSE_AFFINITY.
+ (gfc_match_iterator): New.
+ (gfc_match_omp_clauses): Use it; update call to gfc_free_omp_namelist.
+ (OMP_TASK_CLAUSES): Add OMP_CLAUSE_AFFINITY.
+ (gfc_match_omp_taskwait): Match depend clause.
+ (resolve_omp_clauses): Handle affinity; update for udr/union change.
+ (gfc_resolve_omp_directive): Resolve clauses of taskwait.
+ * st.c (gfc_free_statement): Update gfc_free_omp_namelist call.
+ * trans-openmp.c (gfc_trans_omp_array_reduction_or_udr): Likewise
+ (handle_iterator): New.
+ (gfc_trans_omp_clauses): Handle iterators for depend/affinity clause.
+ (gfc_trans_omp_taskwait): Handle depend clause.
+ (gfc_trans_omp_directive): Update call.
+
2021-05-27 Harald Anlauf <anlauf@gmx.de>
PR fortran/100602
diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index 60bf257..a54153b 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -1842,7 +1842,7 @@ type, then the real-literal-constant will be interpreted as a
Besides decimal constants, Fortran also supports binary (@code{b}),
octal (@code{o}) and hexadecimal (@code{z}) integer constants. The
-syntax is: @samp{prefix quote digits quote}, were the prefix is
+syntax is: @samp{prefix quote digits quote}, where the prefix is
either @code{b}, @code{o} or @code{z}, quote is either @code{'} or
@code{"} and the digits are @code{0} or @code{1} for binary,
between @code{0} and @code{7} for octal, and between @code{0} and