diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2020-04-29 08:12:36 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-04-29 09:54:37 +0200 |
| commit | a5d0bc12e1bfa956941cd9c49d5b978256bd11ec (patch) | |
| tree | 34e79c2f6820956938f414465f5600c9c261951d /libgomp | |
| parent | d20219b5ab26cd003ae78ac9f82be337fe4df261 (diff) | |
[OpenACC] Set 'acc_device_current = -1'
There's no point in using value '-3', and even though not directly related,
value '-1' does match 'GOMP_DEVICE_ICV'.
libgomp/
* config/accel/openacc.f90 (acc_device_current): Set to '-1'.
* openacc.f90 (acc_device_current): Likewise.
* openacc.h (acc_device_current): Likewise.
* openacc_lib.h (acc_device_current): Likewise.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/config/accel/openacc.f90 | 2 | ||||
| -rw-r--r-- | libgomp/openacc.f90 | 2 | ||||
| -rw-r--r-- | libgomp/openacc.h | 2 | ||||
| -rw-r--r-- | libgomp/openacc_lib.h | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 1a7046f2fc6..b6828adcbe3 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,10 @@ 2020-04-29 Thomas Schwinge <thomas@codesourcery.com> + * config/accel/openacc.f90 (acc_device_current): Set to '-1'. + * openacc.f90 (acc_device_current): Likewise. + * openacc.h (acc_device_current): Likewise. + * openacc_lib.h (acc_device_current): Likewise. + PR target/94282 * testsuite/libgomp.c-c++-common/function-not-offloaded.c: Remove 'dg-allow-blank-lines-in-output'. diff --git a/libgomp/config/accel/openacc.f90 b/libgomp/config/accel/openacc.f90 index 275afe43475..99330733d8f 100644 --- a/libgomp/config/accel/openacc.f90 +++ b/libgomp/config/accel/openacc.f90 @@ -44,7 +44,7 @@ module openacc_kinds integer, parameter :: acc_device_kind = int32 ! Keep in sync with include/gomp-constants.h. - integer (acc_device_kind), parameter :: acc_device_current = -3 + integer (acc_device_kind), parameter :: acc_device_current = -1 integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_host = 2 diff --git a/libgomp/openacc.f90 b/libgomp/openacc.f90 index 467fb612c54..111705d0fb6 100644 --- a/libgomp/openacc.f90 +++ b/libgomp/openacc.f90 @@ -41,7 +41,7 @@ module openacc_kinds integer, parameter :: acc_device_kind = int32 ! Keep in sync with include/gomp-constants.h. - integer (acc_device_kind), parameter :: acc_device_current = -3 + integer (acc_device_kind), parameter :: acc_device_current = -1 integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_host = 2 diff --git a/libgomp/openacc.h b/libgomp/openacc.h index 61736463474..1dc471f62bc 100644 --- a/libgomp/openacc.h +++ b/libgomp/openacc.h @@ -49,7 +49,7 @@ extern "C" { /* Types */ typedef enum acc_device_t { /* Keep in sync with include/gomp-constants.h. */ - acc_device_current = -3, + acc_device_current = -1, acc_device_none = 0, acc_device_default = 1, acc_device_host = 2, diff --git a/libgomp/openacc_lib.h b/libgomp/openacc_lib.h index ee08e9787cc..82a3735b106 100644 --- a/libgomp/openacc_lib.h +++ b/libgomp/openacc_lib.h @@ -37,7 +37,7 @@ integer, parameter :: acc_device_kind = 4 ! Keep in sync with include/gomp-constants.h. - integer (acc_device_kind), parameter :: acc_device_current = -3 + integer (acc_device_kind), parameter :: acc_device_current = -1 integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_host = 2 |