From e8f47b663f39d4bc959ef181b0cb8ed935aa4c6d Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Fri, 18 Dec 2015 21:14:58 +0000
Subject: [PATCH] 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
---
 gcc/testsuite/ChangeLog                  | 6 ++++++
 gcc/testsuite/c-c++-common/attr-simd-3.c | 3 +--
 gcc/testsuite/gcc.dg/graphite/id-28.c    | 2 +-
 gcc/testsuite/lib/target-supports.exp    | 6 ++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b2d9d3bcd50..d8202de292c 100644
--- 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 ff8851568ac..56552bd7e08 100644
--- 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 3c4bd2322c4..dd5fb9f70e2 100644
--- 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 d97d186d8f8..10d6444d06d 100644
--- 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
 }
 
-- 
2.30.2