2017-09-14 Tom de Vries <tom@codesourcery.com>
* testsuite/libgomp.c++/cancel-taskgroup-1.C: Remove.
* testsuite/libgomp.c/cancel-taskgroup-1.c: Move to ...
* testsuite/libgomp.c-c++-common/cancel-taskgroup-1.c: ... here.
* testsuite/libgomp.c/c.exp: Include test-cases from
libgomp.c-c++-common.
* testsuite/libgomp.c++/c++.exp: Same. Force c++-mode compilation of .c
files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252775
138bc75d-0d04-0410-961f-
82ee72b054a4
+2017-09-14 Tom de Vries <tom@codesourcery.com>
+
+ * testsuite/libgomp.c++/cancel-taskgroup-1.C: Remove.
+ * testsuite/libgomp.c/cancel-taskgroup-1.c: Move to ...
+ * testsuite/libgomp.c-c++-common/cancel-taskgroup-1.c: ... here.
+ * testsuite/libgomp.c/c.exp: Include test-cases from
+ libgomp.c-c++-common.
+ * testsuite/libgomp.c++/c++.exp: Same. Force c++-mode compilation of .c
+ files.
+
2017-09-14 Jakub Jelinek <jakub@redhat.com>
PR c++/81314
# Turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+# Switch into C++ mode. Otherwise, the libgomp.c-c++-common/*.c
+# files would be compiled as C files.
+set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
+set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
+
set blddir [lookfor_file [get_multilibs] libgomp]
if { $lang_test_file_found } {
# Gather a list of all tests.
- set tests [lsort [find $srcdir/$subdir *.C]]
+ set tests [lsort [concat \
+ [find $srcdir/$subdir *.C] \
+ [find $srcdir/$subdir/../libgomp.c-c++-common *.c]]]
if { $blddir != "" } {
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
dg-runtest $tests "" "$libstdcxx_includes $DEFAULT_CFLAGS"
}
+# See above.
+set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST"
+
# All done.
dg-finish
+++ /dev/null
-// { dg-do run }
-// { dg-set-target-env-var OMP_CANCELLATION "true" }
-
-#include "../libgomp.c/cancel-taskgroup-1.c"
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
# Gather a list of all tests.
-set tests [lsort [find $srcdir/$subdir *.c]]
+set tests [lsort [concat \
+ [find $srcdir/$subdir *.c] \
+ [find $srcdir/$subdir/../libgomp.c-c++-common *.c]]]
set ld_library_path $always_ld_library_path
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]