[OpenACC] Don't compile libgomp testcases with '-w'

We'd like to actually catch compiler diagnostics (and currently there aren't
any).

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c: Don't
	compile with '-w'.
	* testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/reduction-5.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/reduction-6.c: Likewise.
	* testsuite/libgomp.oacc-fortran/parallel-reduction.f90: Likewise.
	* testsuite/libgomp.oacc-fortran/reduction-1.f90: Likewise.
	* testsuite/libgomp.oacc-fortran/reduction-5.f90: Likewise.
	* testsuite/libgomp.oacc-fortran/reduction-6.f90: Likewise.
	* testsuite/libgomp.oacc-fortran/reduction-7.f90: Likewise.

(cherry picked from commit 7c640779bf042ceb05fe50260307af88fed75407)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 33a5f5b0cf674be9c862cadf4cc4f50c5dde16d9..f74d92a67411da2d8adc875b9f64ef44ade3c2f7 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,21 @@
+2021-04-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       Backport from mainline
+       2021-04-16  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c: Don't
+       compile with '-w'.
+       * testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c: Likewise.
+       * testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c:
+       Likewise.
+       * testsuite/libgomp.oacc-c-c++-common/reduction-5.c: Likewise.
+       * testsuite/libgomp.oacc-c-c++-common/reduction-6.c: Likewise.
+       * testsuite/libgomp.oacc-fortran/parallel-reduction.f90: Likewise.
+       * testsuite/libgomp.oacc-fortran/reduction-1.f90: Likewise.
+       * testsuite/libgomp.oacc-fortran/reduction-5.f90: Likewise.
+       * testsuite/libgomp.oacc-fortran/reduction-6.f90: Likewise.
+       * testsuite/libgomp.oacc-fortran/reduction-7.f90: Likewise.
+
 2021-04-29  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/pr85381-3.c: Surpress warnings.

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c
index a88b60f39f0344617c335d6dcc9d4ae3c8c68746..0c1ecc68e9df98728d4e2fed04f81e2f5a2a5b00 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c
@@ -1,5 +1,3 @@
-/* { dg-additional-options "-w" } */
-
 #include <assert.h>
 
 /* Test of reduction on parallel directive.  */

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c
index 5ab52e97009386d03a568fb8d3c8408ec5b3b8fd..e3ed281610d49c07d70a4f1a717f691222b5d54a 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c
@@ -1,8 +1,6 @@
 /* Test of reduction on parallel directive (with async).  */
 /* See also Fortran variants in "../libgomp.oacc-fortran/par-reduction-2*".  */
 
-/* { dg-additional-options "-w" } */
-
 #include <assert.h>
 #include <openacc.h>
 

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c
index 077571f29f0aadbb7673e8124d000830cf6e5c51..80745816fff995e67484bad57f5dd4a80e3596d4 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-additional-options "-w" } */
 
 #include <stdlib.h>
 #include <openacc.h>

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
index 6f5d29316a01c6e2cabf216569dae515f5469e93..1cec9f152c4fa50ddca0c95a91eb6adba5547d1b 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-additional-options "-w" } */
 
 /* Multiple reductions.  */
 

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-6.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-6.c
index af30b31bd344f0d814c00b0424fef2f8e16ce729..82a6ade40f9c50f0804af8fc9447616e2b5247c4 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-6.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-6.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-additional-options "-w" } */
 
 /* Test reductions on explicitly private variables.  */
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90
index 487cfc436e269ef42eeeb473e6c4e78b4a03d014..b926f4fe898524e027c3edf2acb38794befca158 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90
@@ -1,5 +1,4 @@
 ! { dg-do run }
-! { dg-additional-options "-w" }
 
 program reduction
   implicit none

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90
index 764affdbd188781ce3af1b3e0e9dd614096a94e5..40c1a86ab92362cbe46b796efb40b24ce1e631ea 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-1.f90
@@ -1,5 +1,4 @@
 ! { dg-do run }
-! { dg-additional-options "-w" }
 
 ! Integer reductions
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90
index 833d0e4b9fd758d79045a118329cb441765afff0..a529e22d9a27c9e1db9682c0de424411612b2b0f 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90
@@ -1,5 +1,4 @@
 ! { dg-do run }
-! { dg-additional-options "-w" }
 
 ! subroutine reduction
 

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90
index e76867a313fa2735fcfe328bdae7970412e97e45..249ed2edcbcf6a842c6a9309f964f8e14ca27b7a 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-6.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-additional-options "-cpp -w" }
+! { dg-additional-options "-cpp" }
 
 program reduction
   implicit none

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90 b/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90
index a7d6dd8a900164b7674e69fdb9209f6d339e06cb..8cffac93a22c1b41fb0355de1a04730db61cd8bf 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/reduction-7.f90
@@ -1,5 +1,4 @@
 ! { dg-do run }
-! { dg-additional-options "-w" }
 
 ! subroutine reduction with private and firstprivate variables