[gcc r11-7886] libgomp: Fix on_device_arch.c aux-file handling [PR99555]

[Tobias Burnus]

https://gcc.gnu.org/g:d579e2e76f9469e1b386d693af57c5c4f0ede410

commit r11-7886-gd579e2e76f9469e1b386d693af57c5c4f0ede410
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Mon Mar 29 10:38:39 2021 +0200

    libgomp: Fix on_device_arch.c aux-file handling [PR99555]
    
    libgomp/ChangeLog:
    
            PR target/99555
            * testsuite/lib/on_device_arch.c: Move to ...
            * testsuite/libgomp.c-c++-common/on_device_arch.h: ... here.
            * testsuite/libgomp.fortran/on_device_arch.c: New file;
            #include on_device_arch.h.
            * testsuite/libgomp.c-c++-common/task-detach-6.c: #include
            on_device_arch.h instead of using dg-additional-source.
            * testsuite/libgomp.c/pr99555-1.c: Likewise.
            * testsuite/libgomp.fortran/task-detach-6.f90: Update to use
            on_device_arch.c without relative paths.

Diff:
---
 .../{lib/on_device_arch.c => libgomp.c-c++-common/on_device_arch.h}   | 0
 libgomp/testsuite/libgomp.c-c++-common/task-detach-6.c                | 4 +---
 libgomp/testsuite/libgomp.c/pr99555-1.c                               | 3 +--
 libgomp/testsuite/libgomp.fortran/on_device_arch.c                    | 3 +++
 libgomp/testsuite/libgomp.fortran/task-detach-6.f90                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libgomp/testsuite/lib/on_device_arch.c b/libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h
similarity index 100%
rename from libgomp/testsuite/lib/on_device_arch.c
rename to libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h
diff --git a/libgomp/testsuite/libgomp.c-c++-common/task-detach-6.c b/libgomp/testsuite/libgomp.c-c++-common/task-detach-6.c
index 4a3e4a2a3d2..119d7f52f8f 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/task-detach-6.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/task-detach-6.c
@@ -1,10 +1,8 @@
 /* { dg-do run } */
 
-/* { dg-additional-sources "../lib/on_device_arch.c" } */
-extern int on_device_arch_nvptx ();
-
 #include <omp.h>
 #include <assert.h>
+#include "on_device_arch.h"
 
 /* Test tasks with detach clause on an offload device.  Each device
    thread spawns off a chain of tasks, that can then be executed by
diff --git a/libgomp/testsuite/libgomp.c/pr99555-1.c b/libgomp/testsuite/libgomp.c/pr99555-1.c
index 9ba330959d8..0dc17bfa337 100644
--- a/libgomp/testsuite/libgomp.c/pr99555-1.c
+++ b/libgomp/testsuite/libgomp.c/pr99555-1.c
@@ -2,8 +2,7 @@
 
 // { dg-additional-options "-O0" }
 
-// { dg-additional-sources "../lib/on_device_arch.c" }
-extern int on_device_arch_nvptx ();
+#include "../libgomp.c-c++-common/on_device_arch.h"
 
 int main (void)
 {
diff --git a/libgomp/testsuite/libgomp.fortran/on_device_arch.c b/libgomp/testsuite/libgomp.fortran/on_device_arch.c
new file mode 100644
index 00000000000..98822c4b043
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/on_device_arch.c
@@ -0,0 +1,3 @@
+/* Auxiliar file.  */
+/* { dg-do compile  { target skip-all-targets } } */
+#include "../libgomp.c-c++-common/on_device_arch.h"
diff --git a/libgomp/testsuite/libgomp.fortran/task-detach-6.f90 b/libgomp/testsuite/libgomp.fortran/task-detach-6.f90
index eda20e73bb8..bd0beb63179 100644
--- a/libgomp/testsuite/libgomp.fortran/task-detach-6.f90
+++ b/libgomp/testsuite/libgomp.fortran/task-detach-6.f90
@@ -1,6 +1,6 @@
 ! { dg-do run }
 
-! { dg-additional-sources ../lib/on_device_arch.c }
+! { dg-additional-sources on_device_arch.c }
   ! { dg-prune-output "command-line option '-fintrinsic-modules-path=.*' is valid for Fortran but not for C" }
 
 ! Test tasks with detach clause on an offload device.  Each device