From 899bcc0f6115dc6548739c60b74e1e226dd934b2 Mon Sep 17 00:00:00 2001
From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 17 May 2016 21:28:11 +0000
Subject: [PATCH] 	* gcc.c-torture/execute/20030222-1.c: Skip on ptx. 
 * gcc.dg/pr68671.c: Fix ptx xfail-if. 	* gcc.dg/torture/pr54261-1.c: Allocate
 atomic var statically. 	* gcc.dg/torture/type-generic-1.c: Enable
 UNSAFE for ptx.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@236346 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                          | 7 +++++++
 gcc/testsuite/gcc.c-torture/execute/20030222-1.c | 1 +
 gcc/testsuite/gcc.dg/pr68671.c                   | 2 +-
 gcc/testsuite/gcc.dg/torture/pr54261-1.c         | 5 ++++-
 gcc/testsuite/gcc.dg/torture/type-generic-1.c    | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e94e1ebbbe..e803bd63434 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2016-05-17  Nathan Sidwell  <nathan@acm.org>
 
+	* gcc.c-torture/execute/20030222-1.c: Skip on ptx.
+	* gcc.dg/pr68671.c: Fix ptx xfail-if.
+	* gcc.dg/torture/pr54261-1.c: Allocate atomic var statically.
+	* gcc.dg/torture/type-generic-1.c: Enable UNSAFE for ptx.
+
+2016-05-17  Nathan Sidwell  <nathan@acm.org>
+
 	* gcc.target/nvptx/abi-vararg-3.c: New.
 
 2016-05-17  Mikhail Maltsev  <maltsevm@gmail.com>
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030222-1.c b/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
index 385ae686192..a820cf206e1 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20030222-1.c
@@ -4,6 +4,7 @@
    actually truncated to int, in case a single register is wide enough
    for a long long.  */
 /* { dg-skip-if "asm would require extra shift-left-4-byte" { spu-*-* } "*" "" } */
+/* { dg-skip-if "asm requires register allocation" { nvptx-*-* } "*" "" } */
 #include <limits.h>
 
 void
diff --git a/gcc/testsuite/gcc.dg/pr68671.c b/gcc/testsuite/gcc.dg/pr68671.c
index af08cdb09a2..09501561817 100644
--- a/gcc/testsuite/gcc.dg/pr68671.c
+++ b/gcc/testsuite/gcc.dg/pr68671.c
@@ -1,7 +1,7 @@
 /* PR tree-optimization/68671 */
 /* { dg-do run } */
 /* { dg-options " -O2 -fno-tree-dce" } */
-/* { dg-xfail-if "ptxas crashes" { nvptx-*-* } { "" } { "" } } */
+/* { dg-xfail-if "ptxas crashes" { nvptx-*-* } { "*" } { "" } } */
 
 volatile int a = -1;
 volatile int b;
diff --git a/gcc/testsuite/gcc.dg/torture/pr54261-1.c b/gcc/testsuite/gcc.dg/torture/pr54261-1.c
index 571727b0c95..071b3232d46 100644
--- a/gcc/testsuite/gcc.dg/torture/pr54261-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr54261-1.c
@@ -32,7 +32,10 @@ void g (int *at, int val)
 
 int main(void)
 {
-  int x = 41;
+  /* On PTX it is not valid to perform atomic operations on auto
+     variables, which end up in .local.  Making this static places it
+     in .global.  */
+  static int x = 41;
   int a = 1;
   g (&x, a);
 
diff --git a/gcc/testsuite/gcc.dg/torture/type-generic-1.c b/gcc/testsuite/gcc.dg/torture/type-generic-1.c
index 38978185827..ef32b78c1a5 100644
--- a/gcc/testsuite/gcc.dg/torture/type-generic-1.c
+++ b/gcc/testsuite/gcc.dg/torture/type-generic-1.c
@@ -3,7 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-skip-if "No Inf/NaN support" { spu-*-* } } */
-/* { dg-options "-DUNSAFE" { target tic6x*-*-* visium-*-* } } */
+/* { dg-options "-DUNSAFE" { target tic6x*-*-* visium-*-* nvptx-*-* } } */
 /* { dg-add-options ieee } */
 
 #include "../tg-tests.h"
-- 
2.11.4.GIT