[ was: Re: [gomp4 2/9] libgomp: Prepare for testcases without -fopenmp. ]
On 11/07/2013 09:11 AM, Jakub Jelinek wrote:
On Wed, Nov 06, 2013 at 08:42:16PM +0100, tho...@codesourcery.com wrote:
From: Thomas Schwinge <tho...@codesourcery.com>
libgomp/
* testsuite/lib/libgomp.exp (libgomp_init): Don't add -fopenmp to
ALWAYS_CFLAGS.
* testsuite/libgomp.c++/c++.exp (ALWAYS_CFLAGS): Add -fopenmp.
* testsuite/libgomp.c/c.exp (ALWAYS_CFLAGS): Likewise.
* testsuite/libgomp.fortran/fortran.exp (ALWAYS_CFLAGS): Likewise.
* testsuite/libgomp.graphite/graphite.exp (ALWAYS_CFLAGS):
Likewise.
Ok for trunk/gomp-4_0-branch.
Following up on this, how about we drop the now superfluous -fopenmp in
current test-cases?
Tested on x86_64. Verified by analyzing libgomp.log that -fopenmp is
still passed to test-cases as required.
OK for trunk?
Thanks,
- Tom
Remove superfluous -fopenmp from libgomp testcases
2017-09-16 Tom de Vries <t...@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.
---
libgomp/testsuite/libgomp.c++/for-12.C | 2 --
libgomp/testsuite/libgomp.c++/pr69393.C | 2 +-
libgomp/testsuite/libgomp.c++/taskloop-1.C | 2 +-
libgomp/testsuite/libgomp.c++/taskloop-3.C | 2 +-
libgomp/testsuite/libgomp.c++/taskloop-4.C | 2 +-
libgomp/testsuite/libgomp.c/for-4.c | 2 +-
libgomp/testsuite/libgomp.c/pr66199-3.c | 2 +-
libgomp/testsuite/libgomp.c/pr66199-4.c | 2 +-
libgomp/testsuite/libgomp.c/pr66199-6.c | 2 +-
libgomp/testsuite/libgomp.c/taskloop-1.c | 2 +-
libgomp/testsuite/libgomp.c/taskloop-3.c | 2 +-
libgomp/testsuite/libgomp.c/taskloop-4.c | 2 +-
libgomp/testsuite/libgomp.fortran/aligned1.f03 | 2 +-
libgomp/testsuite/libgomp.fortran/condinc1.f | 1 -
libgomp/testsuite/libgomp.fortran/condinc3.f90 | 1 -
libgomp/testsuite/libgomp.fortran/crayptr1.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/crayptr2.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/crayptr3.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/omp_cond1.f | 1 -
libgomp/testsuite/libgomp.fortran/omp_cond3.F90 | 1 -
libgomp/testsuite/libgomp.fortran/pr66199-1.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/pr66199-2.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/recursion1.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/target2.f90 | 2 +-
libgomp/testsuite/libgomp.fortran/target5.f90 | 1 -
libgomp/testsuite/libgomp.fortran/task3.f90 | 1 -
26 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/libgomp/testsuite/libgomp.c++/for-12.C b/libgomp/testsuite/libgomp.c++/for-12.C
index ea32192..295b12f 100644
--- 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 e3f0de1..02605e0 100644
--- 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 66f8e0b..7fc6e46 100644
--- 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 bfd793c..c08a045 100644
--- 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 937cfcc..3783717 100644
--- 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 ef5465e..14f900b 100644
--- 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 fe0ccb4..ffe2858 100644
--- 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 a9b1bb8..6ffa2e5 100644
--- 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 6790f7d..14f8610 100644
--- 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 21551f2..edc7058 100644
--- 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 5356d7f..9c8c49c 100644
--- 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 a69be19..4ac1b5a 100644
--- 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 67a9ab4..2db03e1 100644
--- 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 d94fe8d..6d05635 100644
--- 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 16b937a..7c24303 100644
--- 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 57c59f7..fb9495e 100644
--- 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 c88cc7a..7e69b87 100644
--- 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 9777c6b..5b3de65 100644
--- 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 b557d90..f51e868 100644
--- 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 6c4e36e..fe8c783 100644
--- 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 0cd232f..55ad627 100644
--- 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 e17ab96..0cc0fa5 100644
--- 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 35cb878..0cae261 100644
--- 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 42f704f..40b7b0b 100644
--- 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 c46faf2..4aad88e 100644
--- 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 30ff980..83b0e9f 100644
--- 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
!
