Remove superfluous -fopenmp from libgomp testcases

Reviewed-by: Thomas Schwinge <thomas@codesourcery.com>
2017-09-28  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libgomp.c++/for-12.C: Remove superfluous -fopenmp option
	setting.
	* testsuite/libgomp.c++/pr69393.C: Same.
	* testsuite/libgomp.c++/taskloop-1.C: Same.
	* testsuite/libgomp.c++/taskloop-3.C: Same.
	* testsuite/libgomp.c++/taskloop-4.C: Same.
	* testsuite/libgomp.c/for-4.c: Same.
	* testsuite/libgomp.c/pr66199-3.c: Same.
	* testsuite/libgomp.c/pr66199-4.c: Same.
	* testsuite/libgomp.c/pr66199-6.c: Same.
	* testsuite/libgomp.c/taskloop-1.c: Same.
	* testsuite/libgomp.c/taskloop-3.c: Same.
	* testsuite/libgomp.c/taskloop-4.c: Same.
	* testsuite/libgomp.fortran/aligned1.f03: Same.
	* testsuite/libgomp.fortran/condinc1.f: Same.
	* testsuite/libgomp.fortran/condinc3.f90: Same.
	* testsuite/libgomp.fortran/crayptr1.f90: Same.
	* testsuite/libgomp.fortran/crayptr2.f90: Same.
	* testsuite/libgomp.fortran/crayptr3.f90: Same.
	* testsuite/libgomp.fortran/omp_cond1.f: Same.
	* testsuite/libgomp.fortran/omp_cond3.F90: Same.
	* testsuite/libgomp.fortran/pr66199-1.f90: Same.
	* testsuite/libgomp.fortran/pr66199-2.f90: Same.
	* testsuite/libgomp.fortran/recursion1.f90: Same.
	* testsuite/libgomp.fortran/target2.f90: Same.
	* testsuite/libgomp.fortran/target5.f90: Same.
	* testsuite/libgomp.fortran/task3.f90: Same.

From-SVN: r253250

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 4f8b4b48d6b9202c54e055164a44b3d07e25028d..c3471e8934d0d17456e4743c1e0453d0ad68f576 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,33 @@
+2017-09-28  Tom de Vries  <tom@codesourcery.com>
+
+       * testsuite/libgomp.c++/for-12.C: Remove superfluous -fopenmp option
+       setting.
+       * testsuite/libgomp.c++/pr69393.C: Same.
+       * testsuite/libgomp.c++/taskloop-1.C: Same.
+       * testsuite/libgomp.c++/taskloop-3.C: Same.
+       * testsuite/libgomp.c++/taskloop-4.C: Same.
+       * testsuite/libgomp.c/for-4.c: Same.
+       * testsuite/libgomp.c/pr66199-3.c: Same.
+       * testsuite/libgomp.c/pr66199-4.c: Same.
+       * testsuite/libgomp.c/pr66199-6.c: Same.
+       * testsuite/libgomp.c/taskloop-1.c: Same.
+       * testsuite/libgomp.c/taskloop-3.c: Same.
+       * testsuite/libgomp.c/taskloop-4.c: Same.
+       * testsuite/libgomp.fortran/aligned1.f03: Same.
+       * testsuite/libgomp.fortran/condinc1.f: Same.
+       * testsuite/libgomp.fortran/condinc3.f90: Same.
+       * testsuite/libgomp.fortran/crayptr1.f90: Same.
+       * testsuite/libgomp.fortran/crayptr2.f90: Same.
+       * testsuite/libgomp.fortran/crayptr3.f90: Same.
+       * testsuite/libgomp.fortran/omp_cond1.f: Same.
+       * testsuite/libgomp.fortran/omp_cond3.F90: Same.
+       * testsuite/libgomp.fortran/pr66199-1.f90: Same.
+       * testsuite/libgomp.fortran/pr66199-2.f90: Same.
+       * testsuite/libgomp.fortran/recursion1.f90: Same.
+       * testsuite/libgomp.fortran/target2.f90: Same.
+       * testsuite/libgomp.fortran/target5.f90: Same.
+       * testsuite/libgomp.fortran/task3.f90: Same.
+
 2017-09-28  Tom de Vries  <tom@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/loop-g-1.c (main): Remove

diff --git a/libgomp/testsuite/libgomp.c++/for-12.C b/libgomp/testsuite/libgomp.c++/for-12.C
index ea32192e45d8d94bb3263d61a14b5988a40ea9f3..295b12f96281ef7bb627b5c1546ae725e9ced2f7 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/for-12.C
+++ b/libgomp/testsuite/libgomp.c++/for-12.C
@@ -1,5 +1,3 @@
-/* { dg-options "-fopenmp" } */
-
 extern "C" void abort (void);
 
 #define M(x, y, z) O(x, y, z)

diff --git a/libgomp/testsuite/libgomp.c++/pr69393.C b/libgomp/testsuite/libgomp.c++/pr69393.C
index e3f0de19e3e7c9c18379a2ab15d478f5be835f4f..02605e0ef0e9bc15ac591b0ae1634bf3fc04f350 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/pr69393.C
+++ b/libgomp/testsuite/libgomp.c++/pr69393.C
@@ -1,6 +1,6 @@
 // { dg-do run }
 // { dg-require-effective-target lto }
-// { dg-options "-flto -g -fopenmp" }
+// { dg-options "-flto -g" }
 
 int e = 5;
 

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-1.C b/libgomp/testsuite/libgomp.c++/taskloop-1.C
index 66f8e0b1d7c95f5f32d8ec3aae3bd5ac34e6ea5c..7fc6e4652f0ad5e4941023984222d1e528880c37 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-1.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-1.C
@@ -1,4 +1,4 @@
 // { dg-do run }
-// { dg-options "-O2 -fopenmp" }
+// { dg-options "-O2" }
 
 #include "../libgomp.c/taskloop-1.c"

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-3.C b/libgomp/testsuite/libgomp.c++/taskloop-3.C
index bfd793c1c58602678000f0724e62716712a4bf8e..c08a0451f5ae32e1c9c3c9a37b296eb0a27531b0 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-3.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-3.C
@@ -1,4 +1,4 @@
 // { dg-do run }
-// { dg-options "-O2 -fopenmp" }
+// { dg-options "-O2" }
 
 #include "../libgomp.c/taskloop-3.c"

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-4.C b/libgomp/testsuite/libgomp.c++/taskloop-4.C
index 937cfcc00290931f32e94169d0cd1f6558b3b007..3783717b55677c86b167aab46e6e03a20dc4c3cd 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-4.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-4.C
@@ -1,4 +1,4 @@
 // { dg-do run }
-// { dg-options "-O2 -fopenmp" }
+// { dg-options "-O2" }
 
 #include "../libgomp.c/taskloop-4.c"

diff --git a/libgomp/testsuite/libgomp.c/for-4.c b/libgomp/testsuite/libgomp.c/for-4.c
index ef5465e1e769d3116f62e3434663a836e177f275..14f900b5c4378ebcf1e08bc0c0ecdc4dcbf6a163 100644 (file)
--- a/libgomp/testsuite/libgomp.c/for-4.c
+++ b/libgomp/testsuite/libgomp.c/for-4.c
@@ -1,4 +1,4 @@
-/* { dg-options "-std=gnu99 -fopenmp" } */
+/* { dg-options "-std=gnu99" } */
 
 extern void abort (void);
 

diff --git a/libgomp/testsuite/libgomp.c/pr66199-3.c b/libgomp/testsuite/libgomp.c/pr66199-3.c
index fe0ccb47197f1467f1116a08807eb60029cb521e..ffe28589933105ecffe964a1ca6d9b9b5d384bd1 100644 (file)
--- a/libgomp/testsuite/libgomp.c/pr66199-3.c
+++ b/libgomp/testsuite/libgomp.c/pr66199-3.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp" } */
+/* { dg-options "-O2" } */
 
 int u[1024], v[1024], w[1024];
 

diff --git a/libgomp/testsuite/libgomp.c/pr66199-4.c b/libgomp/testsuite/libgomp.c/pr66199-4.c
index a9b1bb8a59e992130f73a7a99232d6a370f9d392..6ffa2e532bf676548a3be5e0113da92940c17d1c 100644 (file)
--- a/libgomp/testsuite/libgomp.c/pr66199-4.c
+++ b/libgomp/testsuite/libgomp.c/pr66199-4.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp" } */
+/* { dg-options "-O2" } */
 
 #pragma omp declare target
 int u[1024], v[1024], w[1024];

diff --git a/libgomp/testsuite/libgomp.c/pr66199-6.c b/libgomp/testsuite/libgomp.c/pr66199-6.c
index 6790f7dc270b4ae29f7a120470d26fd717fa1023..14f8610eb6188d8f76b51098ff25804beb3c50b1 100644 (file)
--- a/libgomp/testsuite/libgomp.c/pr66199-6.c
+++ b/libgomp/testsuite/libgomp.c/pr66199-6.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp" } */
+/* { dg-options "-O2" } */
 
 #pragma omp declare target
 int u[1024], v[1024], w[1024];

diff --git a/libgomp/testsuite/libgomp.c/taskloop-1.c b/libgomp/testsuite/libgomp.c/taskloop-1.c
index 21551f2950c560c6c7fc7a8e78c2bf7422dd0473..edc70584c1a9f89bb9460b8756d81482ca31d104 100644 (file)
--- a/libgomp/testsuite/libgomp.c/taskloop-1.c
+++ b/libgomp/testsuite/libgomp.c/taskloop-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp -std=c99" } */
+/* { dg-options "-O2 -std=c99" } */
 
 int q, r, e;
 

diff --git a/libgomp/testsuite/libgomp.c/taskloop-3.c b/libgomp/testsuite/libgomp.c/taskloop-3.c
index 5356d7f0251cc45a73964c503f1d0b68eff37390..9c8c49c8da47faefef202c4aa2a2e79e6d1a16b4 100644 (file)
--- a/libgomp/testsuite/libgomp.c/taskloop-3.c
+++ b/libgomp/testsuite/libgomp.c/taskloop-3.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp -std=c99" } */
+/* { dg-options "-O2 -std=c99" } */
 
 int g;
 int a[1024];

diff --git a/libgomp/testsuite/libgomp.c/taskloop-4.c b/libgomp/testsuite/libgomp.c/taskloop-4.c
index a69be19c9c21ed5be2f011f7fdfbd50b76b60d40..4ac1b5a37510ef666eb453ee05230fee4a4706eb 100644 (file)
--- a/libgomp/testsuite/libgomp.c/taskloop-4.c
+++ b/libgomp/testsuite/libgomp.c/taskloop-4.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -fopenmp" } */
+/* { dg-options "-O2" } */
 
 int u[64], v;
 

diff --git a/libgomp/testsuite/libgomp.fortran/aligned1.f03 b/libgomp/testsuite/libgomp.fortran/aligned1.f03
index 67a9ab404236deefc31ff144f9f85d4670e1cfa1..2db03e13058763967db9fe2568478618bdd122ed 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/aligned1.f03
+++ b/libgomp/testsuite/libgomp.fortran/aligned1.f03
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -fcray-pointer" }
+! { dg-options "-fcray-pointer" }
 
   use iso_c_binding, only : c_ptr, c_ptrdiff_t, c_loc
   interface

diff --git a/libgomp/testsuite/libgomp.fortran/condinc1.f b/libgomp/testsuite/libgomp.fortran/condinc1.f
index d94fe8d0fb1ea306fd1d3e7f6053535637e7e14a..6d056355d8a60fd8889b8f414eda6eca56f00f2f 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/condinc1.f
+++ b/libgomp/testsuite/libgomp.fortran/condinc1.f
@@ -1,4 +1,3 @@
-! { dg-options "-fopenmp" }
       program condinc1
       logical l
       l = .false.

diff --git a/libgomp/testsuite/libgomp.fortran/condinc3.f90 b/libgomp/testsuite/libgomp.fortran/condinc3.f90
index 16b937a0afb6a86cb9678c857d835337b328a08d..7c24303e4b436ea912de7419c735c00aba935a5c 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/condinc3.f90
+++ b/libgomp/testsuite/libgomp.fortran/condinc3.f90
@@ -1,4 +1,3 @@
-  ! { dg-options "-fopenmp" }
 program condinc3
   logical l
   l = .false.

diff --git a/libgomp/testsuite/libgomp.fortran/crayptr1.f90 b/libgomp/testsuite/libgomp.fortran/crayptr1.f90
index 57c59f71f9fe7ffbe89fbb75b4bd9fc2f28dd82e..fb9495e7d7aad00d18a9a17894552f65cec592f8 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/crayptr1.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr1.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -fcray-pointer" }
+! { dg-options "-fcray-pointer" }
 
   use omp_lib
   integer :: a, b, c, p

diff --git a/libgomp/testsuite/libgomp.fortran/crayptr2.f90 b/libgomp/testsuite/libgomp.fortran/crayptr2.f90
index c88cc7ab884af1c359d10a0b1258329a4155914b..7e69b87dfa5490d6deb647de8d0a04ac79a9ea8f 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/crayptr2.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr2.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -fcray-pointer" }
+! { dg-options "-fcray-pointer" }
 ! { dg-require-effective-target tls_runtime }
 
   use omp_lib

diff --git a/libgomp/testsuite/libgomp.fortran/crayptr3.f90 b/libgomp/testsuite/libgomp.fortran/crayptr3.f90
index 9777c6b22cc6b0960c3d6386ac775fa3e25a692f..5b3de656c4a868f8578acf8a0fa37f78b4318767 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/crayptr3.f90
+++ b/libgomp/testsuite/libgomp.fortran/crayptr3.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -fcray-pointer" }
+! { dg-options "-fcray-pointer" }
 
   use omp_lib
   integer :: a, b, c, i, p

diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond1.f b/libgomp/testsuite/libgomp.fortran/omp_cond1.f
index b557d90800354fc252d0aa8165c39aff27f248ba..f51e868aa385516716add58e94acf21671d2f0fe 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/omp_cond1.f
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond1.f
@@ -1,5 +1,4 @@
 C Test conditional compilation in fixed form if -fopenmp
-! { dg-options "-fopenmp" }
    10 foo = 2
      &56
       if (foo.ne.256) call abort

diff --git a/libgomp/testsuite/libgomp.fortran/omp_cond3.F90 b/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
index 6c4e36e2293d55a9305e8feac521923429842a10..fe8c783c6abe3af5b614ba7839f34508fbb63903 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
+++ b/libgomp/testsuite/libgomp.fortran/omp_cond3.F90
@@ -1,5 +1,4 @@
 ! Test conditional compilation in free form if -fopenmp
-! { dg-options "-fopenmp" }
    10 foo = 2&
   &56
   if (foo.ne.256) call abort

diff --git a/libgomp/testsuite/libgomp.fortran/pr66199-1.f90 b/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
index 0cd232f3e147d8e8cd5ce5c24271e9414de89d13..55ad6277307347818233cb716bf739537adbd037 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr66199-1.f90
@@ -1,6 +1,6 @@
 ! PR middle-end/66199
 ! { dg-do run }
-! { dg-options "-O2 -fopenmp" }
+! { dg-options "-O2" }
 
   integer :: u(1024), v(1024), w(1024), a, b, c, d, e, a1, b1, a2, b2, d1, d2
   a = 1

diff --git a/libgomp/testsuite/libgomp.fortran/pr66199-2.f90 b/libgomp/testsuite/libgomp.fortran/pr66199-2.f90
index e17ab96c7dc391483d12d5c99283acd4849f7cae..0cc0fa5097fa9b425e1577f0d468816bba1d8a64 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/pr66199-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr66199-2.f90
@@ -1,6 +1,6 @@
 ! PR middle-end/66199
 ! { dg-do run }
-! { dg-options "-O2 -fopenmp" }
+! { dg-options "-O2" }
 
   integer :: u(1024), v(1024), w(1024), a, b, c, d, e, a1, b1, a2, b2, d1, d2
   a = 1

diff --git a/libgomp/testsuite/libgomp.fortran/recursion1.f90 b/libgomp/testsuite/libgomp.fortran/recursion1.f90
index 35cb8786e09778eb0100a2ab9ed01948ccf06db9..0cae26173f69c45b3434948728142bc683d16e77 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/recursion1.f90
+++ b/libgomp/testsuite/libgomp.fortran/recursion1.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -fcheck=recursion" }
+! { dg-options "-fcheck=recursion" }
 !
 ! PR 42517: Bogus runtime error with -fopenmp -fcheck=recursion
 !

diff --git a/libgomp/testsuite/libgomp.fortran/target2.f90 b/libgomp/testsuite/libgomp.fortran/target2.f90
index 42f704f2bb31e4a11b42af60c0f410ef858abf55..40b7b0b985b952db8f228883aec8fbec837d9766 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/target2.f90
+++ b/libgomp/testsuite/libgomp.fortran/target2.f90
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options "-fopenmp -ffree-line-length-160" }
+! { dg-options "-ffree-line-length-160" }
 
 module target2
 contains

diff --git a/libgomp/testsuite/libgomp.fortran/target5.f90 b/libgomp/testsuite/libgomp.fortran/target5.f90
index c46faf226f6d2f8afb092e3c89aebea0c44599f8..4aad88e89d8d9b1ad85aecac858149f6dcafc977 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/target5.f90
+++ b/libgomp/testsuite/libgomp.fortran/target5.f90
@@ -1,5 +1,4 @@
 ! { dg-do compile }
-! { dg-options "-fopenmp" }
 
   integer :: r
   r = 0

diff --git a/libgomp/testsuite/libgomp.fortran/task3.f90 b/libgomp/testsuite/libgomp.fortran/task3.f90
index 30ff9803ea27ea66bee48dbc66f23506c66f3909..83b0e9f8163347e9d6f46ebd951eff387f38a538 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/task3.f90
+++ b/libgomp/testsuite/libgomp.fortran/task3.f90
@@ -1,5 +1,4 @@
 ! { dg-do run }
-! { dg-options "-fopenmp" }
 !
 ! PR fortran/47886
 !