From b3d14b3aa343eb7fc656e7f4d3c9b2dc04be63be Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Wed, 13 Nov 2019 12:37:50 +0000 Subject: [PATCH] Move generic libgomp files from nvptx to accel 2019-11-13 Andrew Stubbs libgomp/ * configure.tgt (nvptx*-*-*): Add "accel" directory. * config/nvptx/libgomp-plugin.c: Move ... * config/accel/libgomp-plugin.c: ... to here. * config/nvptx/lock.c: Move ... * config/accel/lock.c: ... to here. * config/nvptx/mutex.c: Move ... * config/accel/mutex.c: ... to here. * config/nvptx/mutex.h: Move ... * config/accel/mutex.h: ... to here. * config/nvptx/oacc-async.c: Move ... * config/accel/oacc-async.c: ... to here. * config/nvptx/oacc-cuda.c: Move ... * config/accel/oacc-cuda.c: ... to here. * config/nvptx/oacc-host.c: Move ... * config/accel/oacc-host.c: ... to here. * config/nvptx/oacc-init.c: Move ... * config/accel/oacc-init.c: ... to here. * config/nvptx/oacc-mem.c: Move ... * config/accel/oacc-mem.c: ... to here. * config/nvptx/oacc-plugin.c: Move ... * config/accel/oacc-plugin.c: ... to here. * config/nvptx/omp-lock.h: Move ... * config/accel/omp-lock.h: ... to here. * config/nvptx/openacc.f90: Move ... * config/accel/openacc.f90: ... to here. * config/nvptx/pool.h: Move ... * config/accel/pool.h: ... to here. * config/nvptx/proc.c: Move ... * config/accel/proc.c: ... to here. * config/nvptx/ptrlock.c: Move ... * config/accel/ptrlock.c: ... to here. * config/nvptx/ptrlock.h: Move ... * config/accel/ptrlock.h: ... to here. * config/nvptx/sem.c: Move ... * config/accel/sem.c: ... to here. * config/nvptx/sem.h: Move ... * config/accel/sem.h: ... to here. * config/nvptx/thread-stacksize.h: Move ... * config/accel/thread-stacksize.h: ... to here. From-SVN: r278132 --- libgomp/ChangeLog | 42 +++++++++++++++++++ .../config/{nvptx => accel}/libgomp-plugin.c | 0 libgomp/config/{nvptx => accel}/lock.c | 0 libgomp/config/{nvptx => accel}/mutex.c | 0 libgomp/config/{nvptx => accel}/mutex.h | 0 libgomp/config/{nvptx => accel}/oacc-async.c | 0 libgomp/config/{nvptx => accel}/oacc-cuda.c | 0 libgomp/config/{nvptx => accel}/oacc-host.c | 0 libgomp/config/{nvptx => accel}/oacc-init.c | 0 libgomp/config/{nvptx => accel}/oacc-mem.c | 0 libgomp/config/{nvptx => accel}/oacc-plugin.c | 0 libgomp/config/{nvptx => accel}/omp-lock.h | 0 libgomp/config/{nvptx => accel}/openacc.f90 | 0 libgomp/config/{nvptx => accel}/pool.h | 0 libgomp/config/{nvptx => accel}/proc.c | 0 libgomp/config/{nvptx => accel}/ptrlock.c | 0 libgomp/config/{nvptx => accel}/ptrlock.h | 0 libgomp/config/{nvptx => accel}/sem.c | 0 libgomp/config/{nvptx => accel}/sem.h | 0 .../{nvptx => accel}/thread-stacksize.h | 0 libgomp/configure.tgt | 2 +- 21 files changed, 43 insertions(+), 1 deletion(-) rename libgomp/config/{nvptx => accel}/libgomp-plugin.c (100%) rename libgomp/config/{nvptx => accel}/lock.c (100%) rename libgomp/config/{nvptx => accel}/mutex.c (100%) rename libgomp/config/{nvptx => accel}/mutex.h (100%) rename libgomp/config/{nvptx => accel}/oacc-async.c (100%) rename libgomp/config/{nvptx => accel}/oacc-cuda.c (100%) rename libgomp/config/{nvptx => accel}/oacc-host.c (100%) rename libgomp/config/{nvptx => accel}/oacc-init.c (100%) rename libgomp/config/{nvptx => accel}/oacc-mem.c (100%) rename libgomp/config/{nvptx => accel}/oacc-plugin.c (100%) rename libgomp/config/{nvptx => accel}/omp-lock.h (100%) rename libgomp/config/{nvptx => accel}/openacc.f90 (100%) rename libgomp/config/{nvptx => accel}/pool.h (100%) rename libgomp/config/{nvptx => accel}/proc.c (100%) rename libgomp/config/{nvptx => accel}/ptrlock.c (100%) rename libgomp/config/{nvptx => accel}/ptrlock.h (100%) rename libgomp/config/{nvptx => accel}/sem.c (100%) rename libgomp/config/{nvptx => accel}/sem.h (100%) rename libgomp/config/{nvptx => accel}/thread-stacksize.h (100%) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 734395936f0..ad9fdeaeac2 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,45 @@ +2019-11-13 Andrew Stubbs + + * configure.tgt (nvptx*-*-*): Add "accel" directory. + * config/nvptx/libgomp-plugin.c: Move ... + * config/accel/libgomp-plugin.c: ... to here. + * config/nvptx/lock.c: Move ... + * config/accel/lock.c: ... to here. + * config/nvptx/mutex.c: Move ... + * config/accel/mutex.c: ... to here. + * config/nvptx/mutex.h: Move ... + * config/accel/mutex.h: ... to here. + * config/nvptx/oacc-async.c: Move ... + * config/accel/oacc-async.c: ... to here. + * config/nvptx/oacc-cuda.c: Move ... + * config/accel/oacc-cuda.c: ... to here. + * config/nvptx/oacc-host.c: Move ... + * config/accel/oacc-host.c: ... to here. + * config/nvptx/oacc-init.c: Move ... + * config/accel/oacc-init.c: ... to here. + * config/nvptx/oacc-mem.c: Move ... + * config/accel/oacc-mem.c: ... to here. + * config/nvptx/oacc-plugin.c: Move ... + * config/accel/oacc-plugin.c: ... to here. + * config/nvptx/omp-lock.h: Move ... + * config/accel/omp-lock.h: ... to here. + * config/nvptx/openacc.f90: Move ... + * config/accel/openacc.f90: ... to here. + * config/nvptx/pool.h: Move ... + * config/accel/pool.h: ... to here. + * config/nvptx/proc.c: Move ... + * config/accel/proc.c: ... to here. + * config/nvptx/ptrlock.c: Move ... + * config/accel/ptrlock.c: ... to here. + * config/nvptx/ptrlock.h: Move ... + * config/accel/ptrlock.h: ... to here. + * config/nvptx/sem.c: Move ... + * config/accel/sem.c: ... to here. + * config/nvptx/sem.h: Move ... + * config/accel/sem.h: ... to here. + * config/nvptx/thread-stacksize.h: Move ... + * config/accel/thread-stacksize.h: ... to here. + 2019-11-12 Maciej W. Rozycki Tobias Burnus Frederik Harwath diff --git a/libgomp/config/nvptx/libgomp-plugin.c b/libgomp/config/accel/libgomp-plugin.c similarity index 100% rename from libgomp/config/nvptx/libgomp-plugin.c rename to libgomp/config/accel/libgomp-plugin.c diff --git a/libgomp/config/nvptx/lock.c b/libgomp/config/accel/lock.c similarity index 100% rename from libgomp/config/nvptx/lock.c rename to libgomp/config/accel/lock.c diff --git a/libgomp/config/nvptx/mutex.c b/libgomp/config/accel/mutex.c similarity index 100% rename from libgomp/config/nvptx/mutex.c rename to libgomp/config/accel/mutex.c diff --git a/libgomp/config/nvptx/mutex.h b/libgomp/config/accel/mutex.h similarity index 100% rename from libgomp/config/nvptx/mutex.h rename to libgomp/config/accel/mutex.h diff --git a/libgomp/config/nvptx/oacc-async.c b/libgomp/config/accel/oacc-async.c similarity index 100% rename from libgomp/config/nvptx/oacc-async.c rename to libgomp/config/accel/oacc-async.c diff --git a/libgomp/config/nvptx/oacc-cuda.c b/libgomp/config/accel/oacc-cuda.c similarity index 100% rename from libgomp/config/nvptx/oacc-cuda.c rename to libgomp/config/accel/oacc-cuda.c diff --git a/libgomp/config/nvptx/oacc-host.c b/libgomp/config/accel/oacc-host.c similarity index 100% rename from libgomp/config/nvptx/oacc-host.c rename to libgomp/config/accel/oacc-host.c diff --git a/libgomp/config/nvptx/oacc-init.c b/libgomp/config/accel/oacc-init.c similarity index 100% rename from libgomp/config/nvptx/oacc-init.c rename to libgomp/config/accel/oacc-init.c diff --git a/libgomp/config/nvptx/oacc-mem.c b/libgomp/config/accel/oacc-mem.c similarity index 100% rename from libgomp/config/nvptx/oacc-mem.c rename to libgomp/config/accel/oacc-mem.c diff --git a/libgomp/config/nvptx/oacc-plugin.c b/libgomp/config/accel/oacc-plugin.c similarity index 100% rename from libgomp/config/nvptx/oacc-plugin.c rename to libgomp/config/accel/oacc-plugin.c diff --git a/libgomp/config/nvptx/omp-lock.h b/libgomp/config/accel/omp-lock.h similarity index 100% rename from libgomp/config/nvptx/omp-lock.h rename to libgomp/config/accel/omp-lock.h diff --git a/libgomp/config/nvptx/openacc.f90 b/libgomp/config/accel/openacc.f90 similarity index 100% rename from libgomp/config/nvptx/openacc.f90 rename to libgomp/config/accel/openacc.f90 diff --git a/libgomp/config/nvptx/pool.h b/libgomp/config/accel/pool.h similarity index 100% rename from libgomp/config/nvptx/pool.h rename to libgomp/config/accel/pool.h diff --git a/libgomp/config/nvptx/proc.c b/libgomp/config/accel/proc.c similarity index 100% rename from libgomp/config/nvptx/proc.c rename to libgomp/config/accel/proc.c diff --git a/libgomp/config/nvptx/ptrlock.c b/libgomp/config/accel/ptrlock.c similarity index 100% rename from libgomp/config/nvptx/ptrlock.c rename to libgomp/config/accel/ptrlock.c diff --git a/libgomp/config/nvptx/ptrlock.h b/libgomp/config/accel/ptrlock.h similarity index 100% rename from libgomp/config/nvptx/ptrlock.h rename to libgomp/config/accel/ptrlock.h diff --git a/libgomp/config/nvptx/sem.c b/libgomp/config/accel/sem.c similarity index 100% rename from libgomp/config/nvptx/sem.c rename to libgomp/config/accel/sem.c diff --git a/libgomp/config/nvptx/sem.h b/libgomp/config/accel/sem.h similarity index 100% rename from libgomp/config/nvptx/sem.h rename to libgomp/config/accel/sem.h diff --git a/libgomp/config/nvptx/thread-stacksize.h b/libgomp/config/accel/thread-stacksize.h similarity index 100% rename from libgomp/config/nvptx/thread-stacksize.h rename to libgomp/config/accel/thread-stacksize.h diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt index b88bf72fe3d..c5ae9a9e39a 100644 --- a/libgomp/configure.tgt +++ b/libgomp/configure.tgt @@ -154,7 +154,7 @@ case "${target}" in ;; nvptx*-*-*) - config_path="nvptx" + config_path="nvptx accel" ;; *-*-rtems*) -- 2.30.2