[OG13][committed] libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host

[OG13][committed] libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 846 bytes --]

Fix testcase if from
   "OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic"

which has been semi-submitted* to mainline as:
   "[PATCH 09/14] OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic"
https://gcc.gnu.org/pipermail/gcc-patches/2023-June/622221.html

Thus, the mainline version will need the same patch.

(* The patch is part of the OG13 rebased series of a series scheduled for
mainline inclusion; for details, cf. 00/14 email at
https://gcc.gnu.org/pipermail/gcc-patches/2023-June/622213.html )

Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Attachment #2: committed.diff --]
[-- Type: text/x-patch, Size: 1646 bytes --]

commit a9d17fbd1e918019b77a6d9616704db85b5c3e8c
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Wed Jul 19 14:52:00 2023 +0200

    libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host
    
    libgomp/
    
            * testsuite/libgomp.fortran/map-subarray-5.f90: Only expect
            libgomp dg-output for offload_device_nonshared_as.
---
 libgomp/ChangeLog.omp                                | 5 +++++
 libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 7cc64943446..cbc12c0fab0 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,8 @@
+2023-07-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.fortran/map-subarray-5.f90: Only expect
+	libgomp dg-output for offload_device_nonshared_as.
+
 2023-07-19  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90
index e7cdf11e610..59ad01ab76b 100644
--- a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90
+++ b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90
@@ -49,6 +49,6 @@ end do
 
 end
 
-! { dg-output "(\n|\r|\r\n)" }
-! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" }
+! { dg-output "(\n|\r|\r\n)" { target offload_device_nonshared_as } }
+! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" { target offload_device_nonshared_as } }
 ! { dg-shouldfail "" { offload_device_nonshared_as } }