On Thu, 20 Sep 2018 07:41:08 -0700 Cesar Philippidis <ce...@codesourcery.com> wrote:
> On 09/19/2018 03:27 PM, Bernhard Reutner-Fischer wrote: > > On Wed, 5 Sep 2018 12:52:03 -0700 > > Cesar Philippidis <ce...@codesourcery.com> wrote: > >> diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c > >> index eea6b81ebfa..eed868f475b 100644 > >> --- a/gcc/fortran/trans-decl.c > >> +++ b/gcc/fortran/trans-decl.c > >> @@ -46,6 +46,7 @@ along with GCC; see the file COPYING3. If not > >> see #include "trans-stmt.h" > >> #include "gomp-constants.h" > >> #include "gimplify.h" > >> +#include "omp-general.h" > > > > hmz. so the gomp-constants.h include would be redundant, but do we > > really need omp-general.h? > > Good point. omp-general.h is required for oacc_build_routine_dims. > > > Doesn't this suggest to move this oacc dims lowering to > > trans-openmp.c instead, please? > > So something like adding a new gfc_add_omp_offload_attributes to > trans-openmp.c and call it from add_attributes_to_decl? yes. > On a related note, I noticed that I forgot to incorporate this change > in gfortran.h: > > @@ -902,7 +912,7 @@ typedef struct > unsigned oacc_declare_link:1; > > /* This is an OpenACC acclerator function at level N - 1 */ > - unsigned oacc_function:3; > + ENUM_BITFIELD (oacc_function) oacc_function:3; > > It's probably not huge, but I noticed that some other enum bitfields > are declared that way. yea, some compilers had trouble with enum bitfields (where plain int bitfields like here worked fine, IIRC) but i'm not sure if it's considered legacy these days. Fine with me to be safe. > > > btw.. the OACC merge from the gomp4 branch added a copy'n paste > > error in an error message. May i ask you to regtest and install the > > below: > Sure. That looks reasonable. I'll also update and/or add new tests as > necessary. TIA and cheers,