[gcc/devel/omp/gcc-12] Reverted: c-c++-common/gomp/map-6.c: Fix dg-error due to mapping changes

[gcc/devel/omp/gcc-12] Reverted: c-c++-common/gomp/map-6.c: Fix dg-error due to mapping changes

[Tobias Burnus]

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

commit d8909f7d24216fcf6e734ddfd81fe3fda51d437a
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Thu Oct 6 11:00:17 2022 +0200

    Reverted: c-c++-common/gomp/map-6.c: Fix dg-error due to mapping changes
    
    Revert commit a24748da5b48f23ac83fa9f2d128f766e80567ed
    that was added to OG11 as dg-error fix for the cherry-pick of
    "Fortran/OpenMP: Add support for 'close' in map clause"
    r12-944-gcdcec2f8505ea12c2236cf0184d77dd2f5de4832
    
    2022-10-06  Tobias Burnus  <tobias@codesourcery.com>
    
            Revert:
            2021-05-14  Tobias Burnus  <tobias@codesourcery.com>
    
            * c-c++-common/gomp/map-6.c: Remove two dg-error.

Diff:
---
 gcc/testsuite/ChangeLog.omp             | 7 +++++++
 gcc/testsuite/c-c++-common/gomp/map-6.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index f9cd0ba390e..e2e0a291d21 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-10-06  Tobias Burnus  <tobias@codesourcery.com>
+
+	Revert:
+	2021-05-14  Tobias Burnus  <tobias@codesourcery.com>
+
+	* c-c++-common/gomp/map-6.c: Remove two dg-error.
+
 2022-10-06  Tobias Burnus  <tobias@codesourcery.com>
 
 	* gfortran.dg/gomp/depend-5.f90: Update scan-tree-dump.
diff --git a/gcc/testsuite/c-c++-common/gomp/map-6.c b/gcc/testsuite/c-c++-common/gomp/map-6.c
index 194e9e070eb..6ee59714847 100644
--- a/gcc/testsuite/c-c++-common/gomp/map-6.c
+++ b/gcc/testsuite/c-c++-common/gomp/map-6.c
@@ -100,10 +100,10 @@ foo (void)
   #pragma omp target map (always, close)
   ;
 
-  #pragma omp target map (always, always)  /* Note: 'always' appears more than once in map clauses  */
+  #pragma omp target map (always, always)  /* { dg-error "'always' appears more than once in map clauses" } */
   ;
 
-  #pragma omp target map (always, always, close)  /* Note: 'always' appears more than once in map clauses */
+  #pragma omp target map (always, always, close)  /* { dg-error "'always' appears more than once in map clauses" } */
   ;
 
   #pragma omp target map (always, close, to: always, close, b7)