From 33273def7cd81f32d5e5fb9d06e7f5794cb2d46a Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Mon, 22 Jun 2015 13:24:37 -0400
Subject: [PATCH] re PR testsuite/66621 (Mistakenly unsupported tests in
 g++.dg/torture/)

	PR testsuite/66621
	* g++.dg/debug, g++.dg/torture: Use dg-options rather than target
	requirements for C++11 tests.

From-SVN: r224749
---
 gcc/testsuite/g++.dg/debug/localclass1.C    | 3 +--
 gcc/testsuite/g++.dg/debug/nullptr01.C      | 3 +--
 gcc/testsuite/g++.dg/torture/pr40991.C      | 2 +-
 gcc/testsuite/g++.dg/torture/pr47559.C      | 4 ++--
 gcc/testsuite/g++.dg/torture/pr49770.C      | 4 ++--
 gcc/testsuite/g++.dg/torture/pr51198.C      | 2 +-
 gcc/testsuite/g++.dg/torture/pr53161.C      | 2 +-
 gcc/testsuite/g++.dg/torture/pr53602.C      | 3 ++-
 gcc/testsuite/g++.dg/torture/pr55260-1.C    | 4 ++--
 gcc/testsuite/g++.dg/torture/pr56768.C      | 3 ++-
 gcc/testsuite/g++.dg/torture/pr59265.C      | 4 ++--
 gcc/testsuite/g++.dg/torture/vshuf-main.inc | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v16hi.C  | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v16qi.C  | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v2df.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v2di.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v2sf.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v2si.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v4df.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v4di.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v4sf.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v4si.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v8hi.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v8qi.C   | 3 ++-
 gcc/testsuite/g++.dg/torture/vshuf-v8si.C   | 3 ++-
 25 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/gcc/testsuite/g++.dg/debug/localclass1.C b/gcc/testsuite/g++.dg/debug/localclass1.C
index 85adb3b19721..db36d592cf52 100644
--- a/gcc/testsuite/g++.dg/debug/localclass1.C
+++ b/gcc/testsuite/g++.dg/debug/localclass1.C
@@ -1,6 +1,5 @@
 // PR c++/52637
-// { dg-do compile { target c++11 } }
-// { dg-options "-g" }
+// { dg-options "-g -std=c++11" }
 
 template <typename T>
 struct C { };
diff --git a/gcc/testsuite/g++.dg/debug/nullptr01.C b/gcc/testsuite/g++.dg/debug/nullptr01.C
index 64e06e548845..63c16ac8f0e6 100644
--- a/gcc/testsuite/g++.dg/debug/nullptr01.C
+++ b/gcc/testsuite/g++.dg/debug/nullptr01.C
@@ -1,6 +1,5 @@
 // Test that debugging backends don't crash on NULLPTR_TYPE.
-// { dg-do compile { target c++11 } }
-// { dg-options "-fabi-version=0" }
+// { dg-options "-std=c++0x -fabi-version=0" }
 
 typedef decltype(nullptr) nullptr_t;
 
diff --git a/gcc/testsuite/g++.dg/torture/pr40991.C b/gcc/testsuite/g++.dg/torture/pr40991.C
index c04ef9e7ad90..c08124024a75 100644
--- a/gcc/testsuite/g++.dg/torture/pr40991.C
+++ b/gcc/testsuite/g++.dg/torture/pr40991.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++11 } }
+/* { dg-options "-std=gnu++0x" } */
 
 typedef __SIZE_TYPE__ size_t;
 namespace std __attribute__ ((__visibility__ ("default"))) {
diff --git a/gcc/testsuite/g++.dg/torture/pr47559.C b/gcc/testsuite/g++.dg/torture/pr47559.C
index 00731c3ce62f..42dedee291c4 100644
--- a/gcc/testsuite/g++.dg/torture/pr47559.C
+++ b/gcc/testsuite/g++.dg/torture/pr47559.C
@@ -1,5 +1,5 @@
-// { dg-do compile { target c++11 } }
-// { dg-options "-fnon-call-exceptions" }
+// { dg-do compile }
+// { dg-options "-std=c++0x -fnon-call-exceptions" }
 
 void foo (int *k) noexcept
 {
diff --git a/gcc/testsuite/g++.dg/torture/pr49770.C b/gcc/testsuite/g++.dg/torture/pr49770.C
index 8180648cbe6e..7eac9e0d9bbb 100644
--- a/gcc/testsuite/g++.dg/torture/pr49770.C
+++ b/gcc/testsuite/g++.dg/torture/pr49770.C
@@ -1,5 +1,5 @@
-/* { dg-do run { target c++11 } } */
-/* { dg-options "-fno-tree-forwprop" } */
+/* { dg-do run } */
+/* { dg-options "-std=c++0x -fno-tree-forwprop" } */
 
 typedef __SIZE_TYPE__ size_t;
 
diff --git a/gcc/testsuite/g++.dg/torture/pr51198.C b/gcc/testsuite/g++.dg/torture/pr51198.C
index 79819e04eaa2..65009ff54582 100644
--- a/gcc/testsuite/g++.dg/torture/pr51198.C
+++ b/gcc/testsuite/g++.dg/torture/pr51198.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++11 } }
+/* { dg-options "-std=gnu++0x" } */
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/torture/pr53161.C b/gcc/testsuite/g++.dg/torture/pr53161.C
index 483556d9d8b3..766f2942b3d5 100644
--- a/gcc/testsuite/g++.dg/torture/pr53161.C
+++ b/gcc/testsuite/g++.dg/torture/pr53161.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target c++11 } } */
+/* { dg-options "-std=c++11" } */
 void gg();
 static __typeof(gg) __gthrw_gg __attribute__((__weakref__("gg")));
 
diff --git a/gcc/testsuite/g++.dg/torture/pr53602.C b/gcc/testsuite/g++.dg/torture/pr53602.C
index ab0f16fe2e9e..1bb9cf4faaf6 100644
--- a/gcc/testsuite/g++.dg/torture/pr53602.C
+++ b/gcc/testsuite/g++.dg/torture/pr53602.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target c++11 } }
+// { dg-do compile }
+// { dg-options "-std=c++11" }
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/torture/pr55260-1.C b/gcc/testsuite/g++.dg/torture/pr55260-1.C
index dee5b6035328..552da8df2620 100644
--- a/gcc/testsuite/g++.dg/torture/pr55260-1.C
+++ b/gcc/testsuite/g++.dg/torture/pr55260-1.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target c++11 } } */
-/* { dg-options "-fno-inline" } */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu++0x -fno-inline" } */
 /* { dg-add-options bind_pic_locally } */
 
   struct B
diff --git a/gcc/testsuite/g++.dg/torture/pr56768.C b/gcc/testsuite/g++.dg/torture/pr56768.C
index 93d292a9fd6d..db504c500e0f 100644
--- a/gcc/testsuite/g++.dg/torture/pr56768.C
+++ b/gcc/testsuite/g++.dg/torture/pr56768.C
@@ -1,4 +1,5 @@
-// { dg-do compile { target c++11 } }
+// { dg-do compile }
+// { dg-options "-std=c++0x" }
 
 struct Iter
 {
diff --git a/gcc/testsuite/g++.dg/torture/pr59265.C b/gcc/testsuite/g++.dg/torture/pr59265.C
index be4c6e1e8d25..880c454da103 100644
--- a/gcc/testsuite/g++.dg/torture/pr59265.C
+++ b/gcc/testsuite/g++.dg/torture/pr59265.C
@@ -1,5 +1,5 @@
-// { dg-do compile { target c++11 } }
-// { dg-options "-fprofile-use" }
+// { dg-do compile }
+// { dg-options "-fprofile-use -std=gnu++11" }
 
 class A {
   int m_fn1() const;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-main.inc b/gcc/testsuite/g++.dg/torture/vshuf-main.inc
index 697bd019733d..6c2310a4b856 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-main.inc
+++ b/gcc/testsuite/g++.dg/torture/vshuf-main.inc
@@ -1,6 +1,7 @@
 /* Driver fragment for __builtin_shuffle of any vector shape.  */
 
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 extern "C" void abort(void);
 
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v16hi.C b/gcc/testsuite/g++.dg/torture/vshuf-v16hi.C
index 501d9dacc0c3..6277068b8595 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v16hi.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v16hi.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 typedef unsigned short V __attribute__((vector_size(32)));
 typedef V VI;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v16qi.C b/gcc/testsuite/g++.dg/torture/vshuf-v16qi.C
index 1cc8bea0c28e..56801177583b 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v16qi.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v16qi.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 typedef unsigned char V __attribute__((vector_size(16)));
 typedef V VI;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v2df.C b/gcc/testsuite/g++.dg/torture/vshuf-v2df.C
index 71a6ac4c340d..ba45078ea133 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v2df.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v2df.C
@@ -1,4 +1,5 @@
-// // { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// // { dg-do run }
 #if __SIZEOF_DOUBLE__ == 8 && __SIZEOF_LONG_LONG__ == 8
 typedef double V __attribute__((vector_size(16)));
 typedef unsigned long long VI __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v2di.C b/gcc/testsuite/g++.dg/torture/vshuf-v2di.C
index dd521f2e49b4..a4272842a365 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v2di.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v2di.C
@@ -1,4 +1,5 @@
-// // { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// // { dg-do run }
 
 #if __SIZEOF_LONG_LONG__ == 8
 typedef unsigned long long V __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v2sf.C b/gcc/testsuite/g++.dg/torture/vshuf-v2sf.C
index 274dacdaec1b..dd229bac0c3d 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v2sf.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v2sf.C
@@ -1,4 +1,5 @@
-// // { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// // { dg-do run }
 #if __SIZEOF_FLOAT__ == 4
 typedef float V __attribute__((vector_size(8)));
 # if __SIZEOF_INT__ == 4
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v2si.C b/gcc/testsuite/g++.dg/torture/vshuf-v2si.C
index 36aeb82b7660..2670855e0920 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v2si.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v2si.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 #if __SIZEOF_INT__ == 4
 typedef unsigned int V __attribute__((vector_size(8)));
 typedef V VI;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v4df.C b/gcc/testsuite/g++.dg/torture/vshuf-v4df.C
index a1694b21ee7a..e26f2c9b30d4 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v4df.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v4df.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 #if __SIZEOF_DOUBLE__ == 8 && __SIZEOF_LONG_LONG__ == 8
 typedef double V __attribute__((vector_size(32)));
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v4di.C b/gcc/testsuite/g++.dg/torture/vshuf-v4di.C
index 8a5e5c507e85..42cf60cfb31f 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v4di.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v4di.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 #if __SIZEOF_LONG_LONG__ == 8
 typedef unsigned long long V __attribute__((vector_size(32)));
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v4sf.C b/gcc/testsuite/g++.dg/torture/vshuf-v4sf.C
index aa67dbbe6186..c7d584344097 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v4sf.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v4sf.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 
 #if __SIZEOF_FLOAT__ == 4
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v4si.C b/gcc/testsuite/g++.dg/torture/vshuf-v4si.C
index 4d377c11425e..af37de78ba8d 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v4si.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v4si.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 #if __SIZEOF_INT__ == 4
 typedef unsigned int V __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v8hi.C b/gcc/testsuite/g++.dg/torture/vshuf-v8hi.C
index c2be87f5b29c..33b20c68a87b 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v8hi.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v8hi.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 typedef unsigned short V __attribute__((vector_size(16)));
 typedef V VI;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v8qi.C b/gcc/testsuite/g++.dg/torture/vshuf-v8qi.C
index 5ec040e14e39..868150963a60 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v8qi.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v8qi.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 typedef unsigned char V __attribute__((vector_size(8)));
 typedef V VI;
diff --git a/gcc/testsuite/g++.dg/torture/vshuf-v8si.C b/gcc/testsuite/g++.dg/torture/vshuf-v8si.C
index 27631d77548b..8583aa201335 100644
--- a/gcc/testsuite/g++.dg/torture/vshuf-v8si.C
+++ b/gcc/testsuite/g++.dg/torture/vshuf-v8si.C
@@ -1,4 +1,5 @@
-// { dg-do run { target c++11 } }
+// { dg-options "-std=c++11" }
+// { dg-do run }
 
 #if __SIZEOF_INT__ == 4
 typedef unsigned int V __attribute__((vector_size(32)));
-- 
2.47.2