[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.

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1a7046f2fc64e48903f51df9250706c94112a0f4..b6828adcbe3d1c991e6fde3128ad0a8f0ada473c 100644 (file)
--- 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 275afe43475c475e15a1d03cda47b489ac52335c..99330733d8f86acdea900cd163af44a16f7b3ca9 100644 (file)
--- 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 467fb612c548948f561d842cacfc94e05d3910ca..111705d0fb6047cf453d9d359212ba5c5e6062a0 100644 (file)
--- 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 61736463474823d513b2d75a912bfec02ed54e7c..1dc471f62bc70a20de70962fef7d9d09503ab830 100644 (file)
--- 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 ee08e9787cc91829d5fb450cab8d7f5b064539e6..82a3735b1063382852a15287326306fd0aa6e1f3 100644 (file)
--- 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