]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fix Fortran/openmp: Partial OpenMP 5.2 doacross
authorTobias Burnus <tobias@codesourcery.com>
Tue, 6 Sep 2022 08:21:04 +0000 (10:21 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Tue, 6 Sep 2022 08:21:04 +0000 (10:21 +0200)
This removed a checking snippet which accidentally was left in in commit
r13-2446-g938cda536019cd6a1bc0dd2346381185b420bbf8 ; this caused
fails in gfortran.dg/gomp/doacross-5.f90 (added in that very commit).
Note that a similar but refined check is now done in the middle end.
(The ME version additionally checks whether doacross is present.)

gcc/fortran/
* openmp.cc (resolve_omp_clauses): Remove ordered/linear
check as it is handled now in the middle end.

(cherry picked from commit d6582c662ca0da05c74fa3183e1bc2cadcb21424)

gcc/fortran/ChangeLog.omp
gcc/fortran/openmp.cc

index 6ca5ae8eac54bc77e2242028b6ba70a122ae1ffb..6d0a243169b826f8024f5d8b66c0eab7a22279da 100644 (file)
@@ -1,3 +1,11 @@
+2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+       * openmp.cc (resolve_omp_clauses): Remove ordered/linear
+       check as it is handled now in the middle end.
+
 2022-09-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:
index de4a3c3a6e243bf519b1ff7543a9998e6892a14f..054a4415db6ab4566bf1ce32d1390413349d8b5c 100644 (file)
@@ -8408,10 +8408,6 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
                            linear_op = n->u.linear.op;
                          }
                      }
-                   else if (omp_clauses->orderedc)
-                     gfc_error ("LINEAR clause specified together with "
-                                "ORDERED clause with argument at %L",
-                                &n->where);
                    else if (n->u.linear.op != OMP_LINEAR_REF
                             && n->sym->ts.type != BT_INTEGER)
                      gfc_error ("LINEAR variable %qs must be INTEGER "