diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-11-07 16:07:58 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2013-11-07 16:07:58 +0100 |
| commit | 1707a5de88eea3e50166022bfb0a3d5608bb16e5 (patch) | |
| tree | 58d7a7b7ca50655c031627419515b803f7e1daf1 /libgomp | |
| parent | 70f05c436243dd9ca862663f2c05bda86f49719c (diff) | |
| download | gcc-1707a5de88eea3e50166022bfb0a3d5608bb16e5.tar.gz | |
libgomp: Prepare for testcases without -fopenmp.
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.
From-SVN: r204519
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 8 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/c.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.graphite/graphite.exp | 3 |
6 files changed, 20 insertions, 3 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 081850c87b8..00b4ce1ba89 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,13 @@ 2013-11-07 Thomas Schwinge <thomas@codesourcery.com> + * 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_g.h: Include <stddef.h> for size_t. * libgomp.spec.in: Update comment about libgomp's dependencies. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index d1d8bc8627b..c965147e4fd 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/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 a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index b3363062ae8..88e017e4e29 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/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 a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 7dfdf8bde78..8e902d4c131 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/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 a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index b7fef293a22..e0bffe390b7 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/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 a/libgomp/testsuite/libgomp.graphite/graphite.exp b/libgomp/testsuite/libgomp.graphite/graphite.exp index 08aa5095cf9..9129964eb19 100644 --- a/libgomp/testsuite/libgomp.graphite/graphite.exp +++ b/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]] |