[gomp4 2/9] libgomp: Prepare for testcases without -fopenmp.

[thomas]

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.
---
 libgomp/testsuite/lib/libgomp.exp               | 3 ---
 libgomp/testsuite/libgomp.c++/c++.exp           | 3 +++
 libgomp/testsuite/libgomp.c/c.exp               | 3 +++
 libgomp/testsuite/libgomp.fortran/fortran.exp   | 3 +++
 libgomp/testsuite/libgomp.graphite/graphite.exp | 3 +++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git libgomp/testsuite/lib/libgomp.exp libgomp/testsuite/lib/libgomp.exp
index d1d8bc8..c965147 100644
--- libgomp/testsuite/lib/libgomp.exp
+++ libgomp/testsuite/lib/libgomp.exp
@@ -169,9 +169,6 @@ proc libgomp_init { args } {
 
     # Disable color diagnostics
     lappend ALWAYS_CFLAGS "additional_flags=-fdiagnostics-color=never"
-
-    # And, gee, turn on OpenMP.
-    lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
 }
 
 #
diff --git libgomp/testsuite/libgomp.c++/c++.exp 
libgomp/testsuite/libgomp.c++/c++.exp
index b336306..88e017e 100644
--- libgomp/testsuite/libgomp.c++/c++.exp
+++ libgomp/testsuite/libgomp.c++/c++.exp
@@ -11,6 +11,9 @@ set lang_library_path "../libstdc++-v3/src/.libs"
 # Initialize dg.
 dg-init
 
+# Turn on OpenMP.
+lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+
 set blddir [lookfor_file [get_multilibs] libgomp]
 
 
diff --git libgomp/testsuite/libgomp.c/c.exp libgomp/testsuite/libgomp.c/c.exp
index 7dfdf8b..8e902d4 100644
--- libgomp/testsuite/libgomp.c/c.exp
+++ libgomp/testsuite/libgomp.c/c.exp
@@ -17,6 +17,9 @@ if ![info exists DEFAULT_CFLAGS] then {
 # Initialize dg.
 dg-init
 
+# Turn on OpenMP.
+lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+
 # Gather a list of all tests.
 set tests [lsort [find $srcdir/$subdir *.c]]
 
diff --git libgomp/testsuite/libgomp.fortran/fortran.exp 
libgomp/testsuite/libgomp.fortran/fortran.exp
index b7fef29..e0bffe3 100644
--- libgomp/testsuite/libgomp.fortran/fortran.exp
+++ libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -15,6 +15,9 @@ set quadmath_library_path "../libquadmath/.libs"
 # Initialize dg.
 dg-init
 
+# Turn on OpenMP.
+lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+
 if { $blddir != "" } {
     lappend ALWAYS_CFLAGS "additional_flags=-fintrinsic-modules-path=${blddir}"
     # Look for a static libgfortran first.
diff --git libgomp/testsuite/libgomp.graphite/graphite.exp 
libgomp/testsuite/libgomp.graphite/graphite.exp
index 08aa509..9129964 100644
--- libgomp/testsuite/libgomp.graphite/graphite.exp
+++ libgomp/testsuite/libgomp.graphite/graphite.exp
@@ -42,6 +42,9 @@ set PARALLEL_CFLAGS "-ansi -pedantic-errors -O2 \
 # Initialize `dg'.
 dg-init
 
+# Turn on OpenMP.
+lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+
 # Gather a list of all tests.
 set tests [lsort [find $srcdir/$subdir *.c]]
 
-- 
1.8.1.1