[gcc/devel/omp/gcc-12] Define 'OMP_REQUIRES_[...]', 'GOMP_REQUIRES_[...]' in a single place

[gcc/devel/omp/gcc-12] Define 'OMP_REQUIRES_[...]', 'GOMP_REQUIRES_[...]' in a single place

[Tobias Burnus]

https://gcc.gnu.org/g:0c65939b4fc5b7ae43267224d96c95667beecf59

commit 0c65939b4fc5b7ae43267224d96c95667beecf59
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Thu Jul 7 08:51:50 2022 +0200

    Define 'OMP_REQUIRES_[...]', 'GOMP_REQUIRES_[...]' in a single place
    
    Clean up for recent commit 683f11843974f0bdf42f79cdcbb0c2b43c7b81b0
    "OpenMP: Move omp requires checks to libgomp".
    
            gcc/
            * omp-general.h (enum omp_requires): Use 'GOMP_REQUIRES_[...]'.
            include/
            * gomp-constants.h (OMP_REQUIRES_[...]): Update comment.
    
    (cherry picked from commit 2f0d819a81edee50a98a8a05eed585f0a72bb932)

Diff:
---
 gcc/ChangeLog.omp        | 7 +++++++
 gcc/omp-general.h        | 8 ++++----
 include/ChangeLog.omp    | 7 +++++++
 include/gomp-constants.h | 3 +--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index a7bdb1c41fe..f2e1e68eb51 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-07-07  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backport from mainline:
+	2022-07-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* omp-general.h (enum omp_requires): Use 'GOMP_REQUIRES_[...]'.
+
 2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from mainline:
diff --git a/gcc/omp-general.h b/gcc/omp-general.h
index 6074b0214f4..dba350a28d0 100644
--- a/gcc/omp-general.h
+++ b/gcc/omp-general.h
@@ -142,12 +142,12 @@ extern int oacc_get_ifn_dim_arg (const gimple *stmt);
 
 enum omp_requires {
   OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER = 0xf,
-  OMP_REQUIRES_UNIFIED_ADDRESS = 0x10,
-  OMP_REQUIRES_UNIFIED_SHARED_MEMORY = 0x20,
+  OMP_REQUIRES_UNIFIED_ADDRESS = GOMP_REQUIRES_UNIFIED_ADDRESS,
+  OMP_REQUIRES_UNIFIED_SHARED_MEMORY = GOMP_REQUIRES_UNIFIED_SHARED_MEMORY,
   OMP_REQUIRES_DYNAMIC_ALLOCATORS = 0x40,
-  OMP_REQUIRES_REVERSE_OFFLOAD = 0x80,
+  OMP_REQUIRES_REVERSE_OFFLOAD = GOMP_REQUIRES_REVERSE_OFFLOAD,
   OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER_USED = 0x100,
-  OMP_REQUIRES_TARGET_USED = 0x200
+  OMP_REQUIRES_TARGET_USED = GOMP_REQUIRES_TARGET_USED,
 };
 
 extern GTY(()) enum omp_requires omp_requires_mask;
diff --git a/include/ChangeLog.omp b/include/ChangeLog.omp
index 8b361c0d70b..167277b33e3 100644
--- a/include/ChangeLog.omp
+++ b/include/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-07-07  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backport from mainline:
+	2022-07-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* gomp-constants.h (OMP_REQUIRES_[...]): Update comment.
+
 2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from mainline:
diff --git a/include/gomp-constants.h b/include/gomp-constants.h
index 32b734bdbfc..918414ec218 100644
--- a/include/gomp-constants.h
+++ b/include/gomp-constants.h
@@ -368,8 +368,7 @@ enum gomp_map_kind
 #define GOMP_DEPEND_MUTEXINOUTSET	4
 #define GOMP_DEPEND_INOUTSET		5
 
-/* Flag values for requires-directive features, must match corresponding
-   OMP_REQUIRES_* values in gcc/omp-general.h.  */
+/* Flag values for OpenMP 'requires' directive features.  */
 #define GOMP_REQUIRES_UNIFIED_ADDRESS       0x10
 #define GOMP_REQUIRES_UNIFIED_SHARED_MEMORY 0x20
 #define GOMP_REQUIRES_REVERSE_OFFLOAD       0x80