diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2019-02-22 11:50:18 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2019-02-22 11:50:18 +0100 |
| commit | c319667adff8cc10e87ff836f72d5a7471e942c6 (patch) | |
| tree | c6e3f563927cd2a9a71b6b7575a19f14d1c1f46e /gcc/fortran | |
| parent | 568de94944eae2abfa0cdf78bbf8247239f2462d (diff) | |
| download | gcc-c319667adff8cc10e87ff836f72d5a7471e942c6.zip gcc-c319667adff8cc10e87ff836f72d5a7471e942c6.tar.gz gcc-c319667adff8cc10e87ff836f72d5a7471e942c6.tar.bz2 | |
Revert earlier OpenACC 'routine' changes
..., which were committed as part of, but logically don't belong into r261813
"Update OpenACC data clause semantics to the 2.5 behavior", and which confuse
later changes.
gcc/fortran/
* openmp.c (gfc_match_oacc_declare): Revert earlier changes.
gcc/testsuite/
* c-c++-common/goacc/routine-5.c: Revert earlier changes.
* g++.dg/goacc/template.C: Likewise.
From-SVN: r269104
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c3bc30c..74a6890 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2019-02-22 Thomas Schwinge <thomas@codesourcery.com> + + * openmp.c (gfc_match_oacc_declare): Revert earlier changes. + 2019-02-21 Thomas Koenig <tkoenig@gcc.gnu.org> * dump-parse-tree.c (debug): Implement for gfc_expr *, diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 11dd3ae..8aa4a2f 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -2075,13 +2075,6 @@ gfc_match_oacc_declare (void) module_var = true; } - if (ns->proc_name->attr.oacc_function) - { - gfc_error ("Invalid declare in routine with $!ACC DECLARE at %L", - &where); - return MATCH_ERROR; - } - if (s->attr.use_assoc) { gfc_error ("Variable is USE-associated with !$ACC DECLARE at %L", |