[gcc/devel/omp/gcc-11] Fix up 'c-c++-common/goacc/firstprivate-mappings-1.c' for C, non-LP64

[gcc/devel/omp/gcc-11] Fix up 'c-c++-common/goacc/firstprivate-mappings-1.c' for C, non-LP64

[Kwok Yeung]

https://gcc.gnu.org/g:46d1c96da16958173cc05d0f5637321e3cfa171e

commit 46d1c96da16958173cc05d0f5637321e3cfa171e
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Fri May 7 10:57:36 2021 +0200

    Fix up 'c-c++-common/goacc/firstprivate-mappings-1.c' for C, non-LP64
    
    Follow-up to recent og10 commit a70b5b1aa8b3d32f6728dbfcfc00b0cff8c5219d
    "OpenMP 5.0: Implement relaxation of implicit map vs. existing device
    mappings".
    
            gcc/testsuite/
            * c-c++-common/goacc/firstprivate-mappings-1.c: Fix up for C,
            non-LP64.

Diff:
---
 gcc/testsuite/ChangeLog.omp                                | 5 +++++
 gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 89fc9619722..b3c96619e44 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,8 @@
+2021-05-07  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* c-c++-common/goacc/firstprivate-mappings-1.c: Fix up for C,
+	non-LP64.
+
 2021-05-05  Chung-Lin Tang  <cltang@codesourcery.com>
 
 	* c-c++-common/gomp/target-implicit-map-1.c: New test.
diff --git a/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c b/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c
index f43e4b46cb6..ab09dee3d37 100644
--- a/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c
+++ b/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c
@@ -419,8 +419,8 @@ vla (int array_li)
   copyout (array_so)
   /* The gimplifier has created an implicit 'firstprivate' clause for the array
      length.
-     { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(array_li.[0-9]+\) map\(from:array_so \[len: 4\]\)} omplower { target { ! c++ } } } }
-     { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\([^)]+\) map\(from:array_so \[len: 4\]\)} omplower { target { c++ } } } }
+     { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(array_li.[0-9]+\) map\(from:array_so \[len: 4\]\) \[} omplower { target { c && lp64 } } } }
+     { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(D\.[0-9]+\) map\(from:array_so \[len: 4\]\) \[} omplower { target { c++ } } } }
      (C++ computes an intermediate value, so can't scan for 'firstprivate(array_li)'.)  */
   /* For C, non-LP64, the gimplifier has also created a mapping for the array
      itself; PR90859.