diff options
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c++/c++.exp | 7 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index efd08f3..4e4fcc3 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,12 @@ 2015-06-30 Tom de Vries <tom@codesourcery.com> + * testsuite/libgomp.oacc-c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not + already set. Use DEFAULT_CFLAGS in dg-runtest. + * testsuite/libgomp.oacc-c-c++-common/collapse-3.c: Remove dg-options + "-O2". + +2015-06-30 Tom de Vries <tom@codesourcery.com> + * testsuite/libgomp.c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not already set. Use DEFAULT_CFLAGS in dg-runtest. * testsuite/libgomp.c++/atomic-16.C: Remove dg-options "-O2 -fopenmp". diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index f486f9b..80d1359 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -13,6 +13,11 @@ if [info exists lang_include_flags] then { unset lang_include_flags } +# If a testcase doesn't have special options, use these. +if ![info exists DEFAULT_CFLAGS] then { + set DEFAULT_CFLAGS "-O2" +} + # Initialize dg. dg-init @@ -96,7 +101,7 @@ if { $lang_test_file_found } { setenv ACC_DEVICE_TYPE $offload_target_openacc - dg-runtest $tests "$tagopt" $libstdcxx_includes + dg-runtest $tests "$tagopt" "$libstdcxx_includes $DEFAULT_CFLAGS" } } diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c index a5be728..6800428 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c @@ -1,5 +1,4 @@ /* { dg-do run } */ -/* { dg-options "-O2" } */ #include <string.h> #include <stdlib.h> |