Hi! On Tue, 12 Jul 2016 13:03:43 -0700, Cesar Philippidis <ce...@codesourcery.com> wrote: > This patch contains both Jakub's OpenMP and my OpenACC fixes for > PR71704. For reference, the discussion for the original patches can be > found here <https://gcc.gnu.org/ml/gcc-patches/2016-06/msg02084.html>. > > I'll apply this patch to gomp-4_0-branch shortly.
> 2016-07-12 Cesar Philippidis <ce...@codesourcery.com> > > Backport from trunk: > 2016-07-08 Cesar Philippidis <ce...@codesourcery.com> > [...] > 2016-06-01 Jakub Jelinek <ja...@redhat.com> > > gcc/fortran/ > * parse.c (case_decl): Move ST_OMP_* to ... > (case_omp_decl): ... here, new macro. > (verify_st_order): For case_omp_decl, complain about > p->state >= ORDER_EXEC, but don't change p->state otherwise. > > gcc/testsuite > * gfortran.dg/gomp/order-1.f90: New test. > * gfortran.dg/gomp/order-2.f90: New test. ;-) Incorrect ChangeLog updates; fixed in gomp-4_0-branch r238296: commit fbdd5b5332e59166c990e10e41649756e9d3a897 Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Wed Jul 13 13:28:46 2016 +0000 Fix r238262 ChangeLog updates git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@238296 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog.gomp | 17 ++++++++++++----- gcc/testsuite/ChangeLog.gomp | 5 ++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git gcc/fortran/ChangeLog.gomp gcc/fortran/ChangeLog.gomp index 4c51452..2532abc 100644 --- gcc/fortran/ChangeLog.gomp +++ gcc/fortran/ChangeLog.gomp @@ -9,12 +9,19 @@ ST_GET_FCN_CHARACTERISTICS if a non-declarative directive could be matched. - 2016-06-01 Jakub Jelinek <ja...@redhat.com> + 2016-06-30 Jakub Jelinek <ja...@redhat.com> - * parse.c (case_decl): Move ST_OMP_* to ... - (case_omp_decl): ... here, new macro. - (verify_st_order): For case_omp_decl, complain about - p->state >= ORDER_EXEC, but don't change p->state otherwise. + * parse.c (matchs, matcho): Move right before decode_omp_directive. + If spec_only, only gfc_match the keyword and if successful, goto + do_spec_only. + (matchds, matchdo): Define. + (decode_omp_directive): Add spec_only local var and set it. + Use matchds or matchdo macros instead of matchs or matcho + for declare target, declare simd, declare reduction and threadprivate + directives. Return ST_GET_FCN_CHARACTERISTICS if a non-declarative + directive could be matched. + (next_statement): For ST_GET_FCN_CHARACTERISTICS restore + gfc_current_locus from old_locus even if there is no label. 2016-07-01 Cesar Philippidis <ce...@codesourcery.com> diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index d731dc6..d31ff07 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -5,10 +5,9 @@ * gfortran.dg/goacc/pr71704.f90: New test. - 2016-06-01 Jakub Jelinek <ja...@redhat.com> + 2016-06-30 Jakub Jelinek <ja...@redhat.com> - * gfortran.dg/gomp/order-1.f90: New test. - * gfortran.dg/gomp/order-2.f90: New test. + * gfortran.dg/gomp/pr71704.f90: New test. 2016-06-10 Thomas Schwinge <tho...@codesourcery.com> Grüße Thomas
signature.asc
Description: PGP signature