target-supports.exp (check_effective_target_cilkplus): Not nvptx.

	* lib/target-supports.exp (check_effective_target_cilkplus): Not nvptx.
	* c-c++-common/attr-simd-3.c: Require cilkplus.
	* gcc.dg/graphite/id-28.c: Likewise.

From-SVN: r231838

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b2d9d3bcd50d25bc2c0a9b3ebe838e37c0249dde..d8202de292c911d3993d0bd66bebbe15e869a2f6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-18  Nathan Sidwell  <nathan@acm.org>
+
+       * lib/target-supports.exp (check_effective_target_cilkplus): Not nvptx.
+       * c-c++-common/attr-simd-3.c: Require cilkplus.
+       * gcc.dg/graphite/id-28.c: Likewise.
+
 2015-12-18  Bernd Schmidt  <bschmidt@redhat.com>
 
        * gcc.dg/debug/dwarf2/prod-options.c: New test.

diff --git a/gcc/testsuite/c-c++-common/attr-simd-3.c b/gcc/testsuite/c-c++-common/attr-simd-3.c
index ff8851568ac51ee5ca156eb16a302ca05cb0af95..56552bd7e0882079f2151e8cb38efec316c188bc 100644 (file)
--- a/gcc/testsuite/c-c++-common/attr-simd-3.c
+++ b/gcc/testsuite/c-c++-common/attr-simd-3.c
@@ -1,6 +1,5 @@
-/* { dg-do compile } */
+/* { dg-do compile { target cilkplus } } */
 /* { dg-options "-fcilkplus" } */
 /* { dg-prune-output "undeclared here \\(not in a function\\)|\[^\n\r\]* was not declared in this scope" } */
-/* { dg-require-effective-target pthread } */
 
 void f () __attribute__((__simd__, __vector__)); /* { dg-error "in the same function marked as a Cilk Plus" "PR68158" } */

diff --git a/gcc/testsuite/gcc.dg/graphite/id-28.c b/gcc/testsuite/gcc.dg/graphite/id-28.c
index 3c4bd2322c4f25c11bf2a8b642580d10010066b3..dd5fb9f70e24631264055401a685d1319f957478 100644 (file)
--- a/gcc/testsuite/gcc.dg/graphite/id-28.c
+++ b/gcc/testsuite/gcc.dg/graphite/id-28.c
@@ -1,5 +1,5 @@
+/* { dg-do compile { target cilkplus } } */
 /* { dg-options "-fcilkplus -floop-nest-optimize -O3" } */
-/* { dg-require-effective-target pthread } */
 
 #if HAVE_IO
 #include <stdio.h>

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index d97d186d8f88644b3de835937c8c65d7c090a39a..10d6444d06d022425821ba1b1edbb2acbee95acb 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1441,6 +1441,12 @@ proc check_effective_target_cilkplus { } {
     if { [istarget avr-*-*] } {
        return 0;
     }
+
+    # No pthreads on NVPTX
+    if { [istarget nvptx-*-*] } {
+       return 0;
+    }
+
     return 1
 }