diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b657f183ca2def6046ea823fb87f1893b7205ba..c129db948251c029340474c7f8bc1b326e4f72df 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR testsuite/70595
+ * doc/sourcebuild.texi (Effective-Target Keywords, Other
+ attributes): Document cilkplus_runtime.
+
2016-04-28 Martin Jambor <mjambor@suse.cz>
* tree-cfg.c (verify_expr): Verify that local declarations belong to
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index c5354cfc8f36f453fedf0b6879b1dc1ec663f1b5..9a349a3f03aa9c9b4bd1feac076792ade9436cc6 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -1878,6 +1878,9 @@ Target supports wide characters.
@item automatic_stack_alignment
Target supports automatic stack alignment.
+@item cilkplus_runtime
+Target supports the Cilk Plus runtime library.
+
@item cxa_atexit
Target uses @code{__cxa_atexit}.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ec1f3a2cc45df058ec4522fe675d6df70b3d328d..ff7051bd97f8f57414d549ed1107ad9fcb0a9beb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,52 @@
+2016-04-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR testsuite/70595
+ * lib/target-supports.exp (check_libcilkrts_available): Rename to ...
+ (check_effective_target_cilkplus_runtime): ... this.
+ * g++.dg/cilk-plus/cilk-plus.exp: Adapt to it.
+ * gcc.dg/cilk-plus/cilk-plus.exp: Likewise.
+
+ * c-c++-common/cilk-plus/CK/cilk-for-2.c: Remove dg-do target selector.
+ Require cilkplus_runtime.
+ Don't add -lcilkrts.
+ * c-c++-common/cilk-plus/CK/cilk-fors.c: Likewise.
+ * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Likewise.
+ * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Likewise.
+ * c-c++-common/cilk-plus/CK/fib.c: Likewise.
+ * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Likewise.
+ * c-c++-common/cilk-plus/CK/fib_no_return.c: Likewise.
+ * c-c++-common/cilk-plus/CK/fib_no_sync.c: Likewise.
+ * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Likewise.
+ * c-c++-common/cilk-plus/CK/pr60586.c: Likewise.
+ * c-c++-common/cilk-plus/CK/pr69826-1.c: Likewise.
+ * c-c++-common/cilk-plus/CK/pr69826-2.c: Likewise.
+ * c-c++-common/cilk-plus/CK/spawnee_inline.c: Likewise.
+ * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise.
+ * c-c++-common/cilk-plus/CK/spawning_arg.c: Likewise.
+ * c-c++-common/cilk-plus/CK/steal_check.c: Likewise.
+ * c-c++-common/cilk-plus/CK/varargs_test.c: Likewise.
+ * g++.dg/cilk-plus/CK/catch_exc.cc: Likewise.
+ * g++.dg/cilk-plus/CK/cilk-for-tplt.cc: Likewise.
+ * g++.dg/cilk-plus/CK/const_spawn.cc: Likewise.
+ * g++.dg/cilk-plus/CK/fib-opr-overload.cc: Likewise.
+ * g++.dg/cilk-plus/CK/fib-tplt.cc: Likewise.
+ * g++.dg/cilk-plus/CK/for1.cc: Likewise.
+ * g++.dg/cilk-plus/CK/lambda_spawns.cc: Likewise.
+ * g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc: Likewise.
+ * g++.dg/cilk-plus/CK/pr60586.cc: Likewise.
+ * g++.dg/cilk-plus/CK/pr66326.cc: Likewise.
+ * g++.dg/cilk-plus/CK/stl_iter.cc: Likewise.
+ * g++.dg/cilk-plus/CK/stl_rev_iter.cc: Likewise.
+ * g++.dg/cilk-plus/CK/stl_test.cc: Likewise.
+
+ * c-c++-common/cilk-plus/CK/pr63307.c: Remove dg-do target selector.
+ * c-c++-common/cilk-plus/SE/ef_error3.c: Likewise.
+
+ * c-c++-common/cilk-plus/SE/ef_error2.c: Explain target selector.
+
+ * c-c++-common/cilk-plus/CK/test__cilk.c: Run if
+ cilkplus_runtime.
+
2016-04-27 Marc Glisse <marc.glisse@inria.fr>
* gcc.dg/tree-ssa/overflow-2.c: New testcase.
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c
index fd30667f8dccd190052e9e33c738aedd4bb9b624..32e4b9a57697fd0aafa17a86f1a213d7036e65c0 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
int msk;
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c
index 0a8f046b63760e4c702b1b5575d593b15936c6f1..6b2bbf779ae81d5d6432c5bd6e204132c108788c 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c
index ec02613ee912197f47893edac27f57a266e28fcb..5a95a06274f8e016582438167136c3f4d8434b1d 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
int grain_value = 2;
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c
index f4a1f4c1324e16dbeec332e80b09953ce211e188..1f8e84ee3d596268c8996a2a0bfe2a5890c29abe 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c
index a8849fb9e6c9483af2651cb32291c3b890304f62..40e1cb48c256beeeaaad301e2ffbf46c05c0ea89 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c
index 0196a8daba8eaaa6c02078ee7f77d91853608dcc..41fd0dbe1d6ffcab0d00e71efa67531d860a108c 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c
index 47ebef52030c0cc725461aa3ea9e715b7fc1bcc3..ccdbcfdce66bec859d8597e59c3d830ea24e79c8 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c
index a23051d48199f4e373245c9ebf3aed287aa02512..2c2a94b27a5331f44abd5f7b96692d4ad103833a 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c
index 3daaca9ae87de82525c30050fd89b00af42d3892..8f080a112522306639ee16cb077b44ad208dd0aa 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c
index c4012a0a4b1187db3fc08e243461cde1ae2252d8..e2dc7b0c9d57da24cf7e543065d3579981763aa6 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus -O2" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
int noop(int x)
{
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c
index d476c45471235fddce26a800f537074155ccad08..6db5386eaf0fc09d08c11468cdbd0a025ce37390 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c
@@ -1,4 +1,4 @@
/* { dg-options "-fcilkplus -fcompare-debug" } */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile } */
#include "fib_no_return.c"
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c
index bcf7727f0ae5b3f89c86818226725b692552c962..97775243ccda2c298b39a05f276850bb35b65bac 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c
@@ -1,7 +1,7 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#define GRAINSIZE 2
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c
index f4056c62e34cc9b0f84c227ecd392ca8cd4b50c2..64d59291975cd534a16ffc7ee7cab320fe12086b 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus -save-temps" } */
/* { dg-additional-options "-std=gnu99" { target c } } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include "pr69826-1.c"
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
index 233a371f140e6a54abf8b63c6f6f8a9a840352e7..416d77abb11d456a1a6165c98d458c65917a57b6 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus -w" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
index 55ec223abb3511d371173054c12db5e4584ffddd..49592c9e979f4f5164711a6b44a70c8c6e1f83d5 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <stdlib.h>
#define DEFAULT_VALUE 30
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c
index 138b82c187cfae03ed1a617ed39512e40c21b697..f5f062c32b3076de963050f1e3eb71b80c3bf4b8 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#ifdef __cplusplus
extern "C" {
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c
index 6b41c7faf041485000dbcb10c7dbcd1ebe7f891c..00b3c7918333b7d63d704bdd3c31147e3e21b3d5 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#ifdef __cplusplus
extern "C" {
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c
index 2b37cd664c1bf566fcaf65712ca672661ca3dde7..3157473fff4ed235edef17dbcfc3fe1dddd24b6f 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run { target cilkplus_runtime } } */
/* { dg-options "-fcilkplus" } */
int main (void)
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c
index 2714600244090f2aa48e48697478acdb686210ce..d97280043de6be75072a15f99edd0b000aa77666 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <stdarg.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c
index 89e0c39b02c3bbe4642f42087849c6bbf313959f..28c3c98741847e57f0d62aaa9c478b053446f76c 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c
@@ -1,3 +1,4 @@
+/* The warning is x86-only. */
/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
/* { dg-options "-fcilkplus -Wall" } */
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c
index 195e9f1d7a661cea4c3fc01e8354993f6db84f3a..789e2bc013d86fb6e2cbd3197ac536837ae03303 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do compile } */
/* { dg-options "-fcilkplus -Wall" } */
__attribute__((vector (linear (x:y)))) /* { dg-message "parameter" "" { target c++ } } */
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
index 09ddf8b28e3242410ba642ff1031065563023549..82b74886ded5fcb982e07f0c115874705c0ae7ac 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc
@@ -1,6 +1,6 @@
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
#include <assert.h>
#include <unistd.h>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc
index ff9a324a13f7ee415b16468fe3406296c614118c..9481dbef74ef3c8c93ca1c01cf83d6513a9a1af3 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#define SIZE 100
#define CHECK_VALUE 5
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc
index 1ea473f1d57f256479ea2a99252fffd40773ae17..c654826b3d9422e7d9e31e48725e008eae2f7924 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
class Rectangle
{
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc
index 6af4a367b7d6881fd5e68f05ed51b732b0674874..386a5021c9298eaf60b01411a8d22e21ae4cac59 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
#if HAVE_IO
#include <iostream>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc
index dbc2da881a9e04ffe17486779a049e08ef573114..66b1dfa9eb15e5c3f9579b520832721df8888b59 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-*-* } } } */
struct fib_struct
{
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc
index d2243acf581b3d30ef56ed83a4135704f52ab732..b2f76c7019ff6628441972d884c04e4ed8d86b20 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#if HAVE_IO
#include <cstdio>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc
index 9b3d2cc26e7a885e3e111b4c3c5028da60163af6..96d2ea19c111bea787d51a0e3b365f25e65f2318 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc
@@ -1,7 +1,8 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
+/* { dg-require-effective-target c++11 } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-// { dg-require-effective-target c++11 }
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
+
#define FIRST_NUMBER 5
#define SECOND_NUMBER 3
#define HAVE_IO 0
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc
index b6e3fea8531ff513500bbb9a22f1065c2b98174c..1a36262dc6da2197a8ceac9f3256dcdf8ebe0eed 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc
@@ -1,7 +1,7 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
+/* { dg-require-effective-target c++11 } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-// { dg-require-effective-target c++11 }
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
#define FIRST_NUMBER 5
#define SECOND_NUMBER 3
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc
index 6a27cade876c7bcd0b9dc5d88334748e668c017e..47c7828130099e280ea9b65b9b1a1793b01737e3 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */
class Rectangle
{
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc
index 057a9ced2830ffe9557ec033d4680624833b17b8..102b9734275a707fceaae02aa646a3d743c3b3f2 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc
@@ -1,6 +1,6 @@
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <vector>
#include <random>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc
index d68ee7b7e7bf0d17cd95440ecda7d9c18175c61f..ed489d8b00a485d546db0aced450c4a96729aa89 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <vector>
#include <cstdio>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc
index 6eee0d99ed1421af920ae5c52df4bbe58ce9aee7..ddc96d1223dc659315ee39d7eb4e35aee84bcb04 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <vector>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc
index 84518f343440f01b2a2c5743c555040b3be1b80b..02b57c33a66ec75fc3504bec8ba08911af6de50e 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc
@@ -1,6 +1,6 @@
-/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target cilkplus_runtime } */
/* { dg-options "-fcilkplus" } */
-/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
#include <iostream>
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
index c8ffe9762fe4d90e227a261c2061d4744599fb11..1e9f4af3a70bda364dc8c769553420a6fc5d0f31 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
+++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
@@ -55,7 +55,7 @@ if [cilkplus_init] {
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -g -O3 -fcilkplus" " "
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -O3 -ftree-vectorize -fcilkplus -g" " "
- if { [check_libcilkrts_available] } {
+ if { [check_effective_target_cilkplus_runtime] } {
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -O1 -fcilkplus" " "
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -O3 -fcilkplus" " "
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -g -fcilkplus" " "
diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
index dbcd0be780bb7b2eaecfec4d5df8144ff58a9f1a..fac975c6fc1ce9167ab1230a15189d8a9050cc6d 100644
--- a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
+++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
@@ -44,7 +44,7 @@ if [cilkplus_init] {
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " "
- if { [check_libcilkrts_available] } {
+ if { [check_effective_target_cilkplus_runtime] } {
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g " " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 " " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 " " "
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 422bbab16cb6fcdbe77ed6661d34a8ba17b5b41b..04ca17656f2f26dda710e8a0f9ca77dd963ab39b 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1279,8 +1279,8 @@ proc check_iconv_available { test_what } {
}
# Return true if Cilk Library is supported on the target.
-proc check_libcilkrts_available { } {
- return [ check_no_compiler_messages_nocache libcilkrts_available executable {
+proc check_effective_target_cilkplus_runtime { } {
+ return [ check_no_compiler_messages_nocache cilkplus_runtime executable {
#ifdef __cplusplus
extern "C"
#endif