6 files changed, 13 insertions, 4 deletions
diff --git a/libgomp/target.c b/libgomp/target.c
index c66c61b..86f9d30 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -2410,6 +2410,8 @@ GOMP_offload_register_ver (unsigned version, const void *host_table,
   gomp_mutex_unlock (&register_lock);
 }
 
+/* Legacy entry point.  */
+
 void
 GOMP_offload_register (const void *host_table, int target_type,
 		       const void *target_data)
@@ -2462,6 +2464,8 @@ GOMP_offload_unregister_ver (unsigned version, const void *host_table,
   gomp_mutex_unlock (&register_lock);
 }
 
+/* Legacy entry point.  */
+
 void
 GOMP_offload_unregister (const void *host_table, int target_type,
 			 const void *target_data)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 891f909..107a3c2 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -348,6 +348,11 @@ proc libgomp_check_effective_target_offload_target { target_name } {
     return 0
 }
 
+# Return 1 if compiling for any offload target.
+proc check_effective_target_offload_target_any { } {
+    return [libgomp_check_effective_target_offload_target ""]
+}
+
 # Return 1 if compiling for offload target nvptx.
 proc check_effective_target_offload_target_nvptx { } {
     return [libgomp_check_effective_target_offload_target "nvptx"]
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-1.c b/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
index fedf977..ab9a8dd 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
 /* { dg-additional-sources requires-1-aux.c } */
 
 /* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-3.c b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
index 7091f40..1c204c8a 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
 /* { dg-additional-sources requires-3-aux.c } */
 
 /* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-7.c b/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
index c94a4c1..7473aa6 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
 /* { dg-additional-sources requires-7-aux.c } */
 
 /* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.fortran/requires-1.f90 b/libgomp/testsuite/libgomp.fortran/requires-1.f90
index 33741af..e957b1b 100644
--- a/libgomp/testsuite/libgomp.fortran/requires-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/requires-1.f90
@@ -1,4 +1,4 @@
-! { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } }
+! { dg-do link { target offload_target_any } }
 ! { dg-additional-sources requires-1-aux.f90 }
 
 ! Check diagnostic by device-compiler's lto1.