[gcc r15-4315] Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Harmonize 'li

[Thomas Schwinge via Gcc-cvs]

https://gcc.gnu.org/g:9f549d216c9716e787aaa38593bc9f83195b60ae

commit r15-4315-g9f549d216c9716e787aaa38593bc9f83195b60ae
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date:   Mon Oct 14 10:34:34 2024 +0200

    Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' 
__builtin_is_initial_device: Harmonize 'libgomp.oacc-fortran/acc_on_device-1-*'
    
    The test case 'libgomp.oacc-fortran/acc_on_device-1-1.f90' added in
    commit 3269a722b7a03613e9c4e2862bc5088c4a17cc11
    "Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' 
__builtin_is_initial_device"
    was missing '-fno-builtin-acc_on_device', and all
    'libgomp.oacc-fortran/acc_on_device-1-*' need comments, why that option is
    specified.
    
            PR testsuite/82250
            libgomp/
            * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Add
            '-fno-builtin-acc_on_device'.
            * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Comment.
            * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Comment.

Diff:
---
 libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90 | 3 +++
 libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f   | 5 ++++-
 libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f   | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90 
b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
index 89748204f05a..774c2b869e80 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90
@@ -1,6 +1,9 @@
 ! { dg-do run }
 ! { dg-additional-options "-cpp" }
 
+! Disable the acc_on_device builtin; we want to test the libgomp library 
function.
+! { dg-additional-options -fno-builtin-acc_on_device }
+
 ! { dg-additional-options "-fopt-info-all-omp" }
 ! { dg-additional-options "--param=openacc-privatization=noisy" }
 ! { dg-additional-options "-foffload=-fopt-info-all-omp" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f 
b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
index e31e0fc715bd..b57beac6f43d 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f
@@ -1,5 +1,8 @@
 ! { dg-do run }
-! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
+! { dg-additional-options "-cpp" }
+
+! Disable the acc_on_device builtin; we want to test the libgomp library 
function.
+! { dg-additional-options -fno-builtin-acc_on_device }
 
 ! { dg-additional-options "-fopt-info-all-omp" }
 ! { dg-additional-options "--param=openacc-privatization=noisy" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f 
b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
index 0595be241f8f..969d530e30ff 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f
@@ -1,5 +1,8 @@
 ! { dg-do run }
-! { dg-additional-options "-cpp -fno-builtin-acc_on_device" }
+! { dg-additional-options "-cpp" }
+
+! Disable the acc_on_device builtin; we want to test the libgomp library 
function.
+! { dg-additional-options -fno-builtin-acc_on_device }
 
 ! { dg-additional-options "-fopt-info-all-omp" }
 ! { dg-additional-options "--param=openacc-privatization=noisy" }