On Thu, May 21, 2015 at 01:02:12PM +0200, Thomas Schwinge wrote:
> Hi!
>
> On Thu, 7 May 2015 19:32:26 +0100, Julian Brown <[email protected]>
> wrote:
> > Here's a new version of the patch [...]
>
> > OK for trunk?
>
> Makes sense to me (with just a request to drop the testsuite changes, see
> below), to get the existing regressions under control. Jakub?
Ok for trunk.
>
> > PR libgomp/65742
> >
> > gcc/
> > * builtins.c (expand_builtin_acc_on_device): Don't use open-coded
> > sequence for !ACCEL_COMPILER.
> >
> > libgomp/
> > * oacc-init.c (plugin/plugin-host.h): Include.
> > (acc_on_device): Check whether we're in an offloaded region for
> > host_nonshm
> > plugin. Don't use __builtin_acc_on_device.
> > * plugin/plugin-host.c (GOMP_OFFLOAD_openacc_parallel): Set
> > nonshm_exec flag in thread-local data.
> > (GOMP_OFFLOAD_openacc_create_thread_data): Allocate thread-local
> > data for host_nonshm plugin.
> > (GOMP_OFFLOAD_openacc_destroy_thread_data): Free thread-local data
> > for host_nonshm plugin.
> > * plugin/plugin-host.h: New.
> > * testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c: Remove
> > -fno-builtin-acc_on_device flag.
> > * testsuite/libgomp.oacc-c-c++-common/if-1.c: Likewise.
> > * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Remove
> > comment re: acc_on_device builtin.
> > * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Likewise.
> > * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Likewise.> commit
> > adccf2e7d313263d585f63e752a4d36653d47811
Jakub
