Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Thomas Schwinge <thomas@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]

Hi!

On Tue, 30 Jun 2015 03:39:42 +0300, Ilmir Usmanov <me@ilmir.us> wrote:
> 08.06.2015, 17:59, "Cesar Philippidis" <cesar@codesourcery.com>:
> > On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:
> >>  08.06.2015, 00:01, "Ilmir Usmanov" <me@ilmir.us>:
> >>>>  This patch fixes checks of OpenMP and OpenACC continuations in
> >>>>  case if someone mixes them (i.e. continues OpenMP directive with
> >>>>  !$ACC sentinel or vice versa).

Thanks for working on this!

> >>>>  OK for gomp branch?

The same applies to GCC trunk, as far as I can tell -- any reason not to
apply the patch to trunk?

> > Thanks for working on this. Does this fix PR63858 by any chance?
> No problem. I had a feeling that something is wrong in the scanner since 
> I've committed an initial support of OpenACC ver. 1.0 to gomp branch 
> (more than a year ago).
> Now it does fix the PR, because I've added support of fixed form to the 
> patch. BTW, your test in the PR has a wrong continuation. Fixed test 
> added to the patch.

I understand correctly that your patch does fix
<https://gcc.gnu.org/PR63858>, right?  In that case, please assign the PR
to yourself, and close it as fixed, once it is fixed in trunk.

> --- a/gcc/fortran/ChangeLog.gomp
> +++ b/gcc/fortran/ChangeLog.gomp
> @@ -1,3 +1,13 @@
> +2015-06-30  Ilmir Usmanov  <me@ilmir.us>
> +
> +	PR/63858

The format to use is PR [component]/[number], so here: PR fortran/63858.

> --- a/gcc/testsuite/ChangeLog.gomp
> +++ b/gcc/testsuite/ChangeLog.gomp
> @@ -1,3 +1,10 @@
> +2015-06-30  Ilmir Usmanov  <me@ilmir.us>
> +
> +	PR/63858

Same.

> --- /dev/null
> +++ b/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f
> @@ -0,0 +1,32 @@
> +! { dg-do compile }
> +! { dg-additional-options "-fopenmp" }

For C, C++, we have a goacc-gomp directory, where both OpenACC and OpenMP
are enabled -- does that make sense to have for Fortran, too?


Grüße,
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]