summaryrefslogtreecommitdiffstats
path: root/gcc/testsuite/g++.dg/cpp0x/lambda
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/testsuite/g++.dg/cpp0x/lambda')
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-50220.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-array.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-redundancy.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv4.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv5.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctor-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctors.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-decltype1.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg3.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-direct-init.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-field-names.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-for.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice5.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice6.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-lookup-neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ns-scope.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-std-function.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-switch.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template10.C4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-type.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-uneval.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use.C4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn1.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn2.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn3.C3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn4.C3
95 files changed, 114 insertions, 124 deletions
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-50220.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-50220.C
index 240143cf65c..4da9d469112 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-50220.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-50220.C
@@ -1,5 +1,5 @@
// PR c++/50220
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template<typename Foo> struct Foobar {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__.C
index 1cc7bb65833..52bb874c5df 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__.C
@@ -1,6 +1,5 @@
// PR c++/44160
-// { dg-options -std=c++0x }
-// { dg-do link }
+// { dg-do link { target c++11 } }
int main()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-array.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-array.C
index 2129051ed72..adb40ed6b71 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-array.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-array.C
@@ -1,6 +1,5 @@
// Test that array capture by copy works.
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto1.C
index b5ba0663754..d13e2c0da19 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-auto1.C
@@ -1,5 +1,5 @@
// PR c++/50437
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template <typename T>
void f()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref-neg.C
index 7d1a1bd89d2..9c9632cd516 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C
index 704c24085d0..16fd0a713a7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-const-ref.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C
index 82cc98423ee..3f9da7e4665 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-neg.C
@@ -1,5 +1,5 @@
// PR c++/50736
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-do compile { target c++11 } }
int i;
void f();
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-redundancy.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-redundancy.C
index 51e55a7aa4c..49fbdf32045 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-redundancy.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-capture-redundancy.C
@@ -1,5 +1,6 @@
// FDIS 5.1.2/8
-// { dg-options "-pedantic-errors -std=c++0x" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-pedantic-errors" }
struct S2 { void f(int i); };
void S2::f(int i) {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const-neg.C
index 7e7541ca2ee..28ea53363a5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C
index 5f6f0b3dcb8..c6150f17456 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C
index d2457d6491c..884163a291e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C
@@ -1,6 +1,6 @@
// PR c++/52026
-// { dg-options "-std=c++11 -O" }
-// { dg-do run }
+// { dg-options "-O" }
+// { dg-do run { target c++11 } }
template<bool B>
int func() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
index 5409d5ca388..08d8bbfc200 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv.C
@@ -1,6 +1,6 @@
// Test for conversion from stateless lambda to function pointer.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
// { dg-final { scan-assembler "weak\[^\n\r\]*_?_ZZ1fvENKUlvE_cvPFvvEEv" { target { ! { *-*-darwin* *-*-mingw* *-*-cygwin *-*-hpux10* } } } } }
inline void f()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv2.C
index fc19c9969d7..cd4cf7e6199 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv2.C
@@ -1,7 +1,6 @@
// Test for conversion from stateless lambda to function pointer.
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
typedef int (*pfn)(int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv3.C
index e4e7daffdd5..ebc6c14d2c0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv3.C
@@ -2,7 +2,7 @@
// work properly for variadics. Make sure that we can still use the lambda
// normally.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
void f()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv4.C
index 6584d28b9a8..66c09102d80 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv4.C
@@ -1,5 +1,5 @@
// PR c++/43641
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct B
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv5.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv5.C
index 53d8e995ef9..f5408a96262 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv5.C
@@ -1,5 +1,5 @@
// PR c++/45080
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
typedef void(*pfn)();
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C
index bd904372367..3b3fda9f946 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C
@@ -1,6 +1,5 @@
// PR c++/55015
-// { dg-do link }
-// { dg-options -std=c++11 }
+// { dg-do link { target c++11 } }
typedef void (*VoidFunc)();
inline VoidFunc GetFunc() { return [](){}; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default-neg.C
index 1af2a95d8a6..91f5d621b0a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
int main() {
int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C
index 239a99cbf96..232c56b46e1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-default.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
int main() {
int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-neg.C
index d77e57e6310..caffb7f258e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
int main() {
int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C
index 7356872e1ab..6d27d75febf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-copy.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
int main() {
int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctor-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctor-neg.C
index 76ed7445f45..4a63d000f2e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctor-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctor-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
void f()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctors.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctors.C
index e263145b01d..8dfb2fa6b6c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctors.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ctors.C
@@ -1,5 +1,4 @@
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C
index 07fc1896c81..b8b15d01aee 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C
@@ -1,5 +1,6 @@
// PR c++/43502
-// { dg-options "-std=c++0x -fcompare-debug" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-fcompare-debug" }
void g (int n)
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-decltype1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-decltype1.C
index 0ab0cddb54a..b36ca21673f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-decltype1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-decltype1.C
@@ -1,6 +1,7 @@
// PR c++/59791
// We force the gimple dump to trigger use of lang_decl_name.
-// { dg-options "-std=c++11 -fdump-tree-gimple" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-fdump-tree-gimple" }
// { dg-final { cleanup-tree-dump "gimple" } }
template < class T > void
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C
index f93e78a27c4..88970a93309 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C
@@ -1,6 +1,6 @@
// Testcase for DR 975.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
bool b;
struct A { int fn1(); const int& fn2(); };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C
index 5c63409b681..fdbb4e1e377 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C
@@ -1,7 +1,8 @@
// Test that this is accepted even when pedantic now that it's part
// of the standard.
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-pedantic" }
bool b;
template <class T>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C
index c932c09db3c..6ada75756ca 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
int main() {
int i = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C
index cc5cc540217..b0e2d9fbabe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
index eeb9814a054..5cf016cb907 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-deduce2.C
@@ -1,5 +1,5 @@
// PR c++/43875
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
void f();
void f(int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg.C
index 069935823ea..cefa24d434e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-do compile { target c++11 } }
int main()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg2.C
index f47c5ba27ae..35104c392a3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg2.C
@@ -1,5 +1,5 @@
// PR c++/43886
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
void f2() {
int i = 1;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg3.C
index f02fb29b36e..1c593930133 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-defarg3.C
@@ -1,5 +1,6 @@
// PR c++/55223
-// { dg-options "-std=c++11 -fabi-version=0" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-fabi-version=0" }
// { dg-final { scan-assembler "_ZN8functionC1IZN1CIiE4testES_Ed_UliE_EET_" } }
struct function
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-direct-init.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-direct-init.C
index bbc2a1ca52d..7cc3f8f6701 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-direct-init.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-direct-init.C
@@ -1,5 +1,5 @@
// Test that capture by copy uses direct-initialization.
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh.C
index ea5060d1a3d..7516fe0fe01 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh.C
@@ -1,9 +1,9 @@
// Test that we properly clean up if we get an exception in the middle of
// constructing the closure object.
-// { dg-options -std=c++0x }
// This test fails because of PR 41449; it isn't a lambda issue.
// { dg-do run { xfail *-*-* } }
+// { dg-require-effective-target c++11 }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
index 0c94b554f86..1ef510a484a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
@@ -1,7 +1,7 @@
// PR c++/47263
// PR c++/49260
-// { dg-options "-std=c++0x -fno-asynchronous-unwind-tables -fno-dwarf2-cfi-asm" }
-// { dg-do run }
+// { dg-options "-fno-asynchronous-unwind-tables -fno-dwarf2-cfi-asm" }
+// { dg-do run { target c++11 } }
#include <exception>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc.C
index 92c54313874..3dc7f8774c3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc.C
@@ -1,6 +1,6 @@
// Test that error messages about creating the closure object refer to
// the lambda-introducer.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C
index 213f7c0babf..4ddd38cc4ee 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C
@@ -1,5 +1,5 @@
// PR c++/42399
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct A {
A();
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-field-names.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-field-names.C
index b292d889806..1c5cfdbd8e0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-field-names.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-field-names.C
@@ -2,7 +2,7 @@
// declared in the closure type" -- test that there isn't a member of the
// closure with the same name as the captured variable.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template <class T>
struct A: public T
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-for.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-for.C
index f161da85774..0123034e09c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-for.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-for.C
@@ -1,5 +1,6 @@
// PR c++/50114
-// { dg-options "-std=c++0x -w" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-w" }
int open()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice1.C
index 1ea8f4d7b58..e4a11eaf667 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice1.C
@@ -1,5 +1,5 @@
// PR c++/43790
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C
index 6468f18a0ac..6a31e0a36f3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C
@@ -1,5 +1,5 @@
// PR c++/42083
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template<typename F>
decltype(F()) run(F f) // { dg-message "note" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C
index 8ff36478d53..03a7a4bb60d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice3.C
@@ -1,5 +1,5 @@
// PR c++/47795
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
class Klass
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C
index 77c773bbdb3..8c08e909a76 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C
@@ -1,5 +1,5 @@
// PR c++/47242
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template < typename > void
bar ()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice5.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice5.C
index 305db812d82..914e0f71e00 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice5.C
@@ -1,5 +1,5 @@
// PR c++/51227
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template<int> int foo()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice6.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice6.C
index ddf352766eb..408af4203ba 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice6.C
@@ -1,4 +1,4 @@
// PR c++/51464
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template<int = sizeof([])> struct A {}; // { dg-error "lambda" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C
index 946377e550a..d0ee866110d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C
@@ -1,5 +1,5 @@
// PR c++/52487
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct A; // { dg-error "forward declaration" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class-neg.C
index a93857e46af..92a165d95bb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C
index 33f4301e44f..92981109fd8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-in-class.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C
index 078ebaee183..029576eabdd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C
@@ -1,5 +1,5 @@
// PR c++/50863
-// { dg-options -std=gnu++0x }
+// { dg-do compile { target c++11 } }
struct T {
template<typename F>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C
index daaa33938ad..3c25f0eb97d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C
@@ -1,5 +1,5 @@
// PR c++/54947
-// { dg-options -std=gnu++11 }
+// { dg-do compile { target c++11 } }
struct X
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-lookup-neg.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-lookup-neg.C
index e07e892a1a3..a952526a17c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-lookup-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-lookup-neg.C
@@ -1,5 +1,5 @@
// Test that we don't crash on a failed lookup.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
int main()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
index 5c9b483d3a6..220817a733f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
@@ -1,6 +1,7 @@
// Test lambda mangling
// { dg-require-weak "" }
-// { dg-options "-std=c++0x -fno-inline" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-fno-inline" }
template<typename F> int algo(F fn) { return fn(); }
inline void g(int n) {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle2.C
index 4b7d15ad953..54309a9dd93 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle2.C
@@ -1,6 +1,5 @@
// PR c++/49276
-// { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template <int N>
struct F
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C
index 06913a1c1a7..5f17a21cac4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle3.C
@@ -1,5 +1,5 @@
// PR c++/51818
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
// { dg-final { scan-assembler "_ZN1AC1IN3foo3barMUlvE_EEET_" } }
struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C
index ed0565fa9ce..d3f434195ea 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mixed.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C
index 73a4d1bac74..2c6b0f20644 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mutable.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
index df2b03705ae..a09af89ce43 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
@@ -1,5 +1,6 @@
// PR c++/56710
-// { dg-options "-std=c++11 -Wall" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wall" }
int main()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C
index feb0cde597d..c8ea46a980f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested2.C
index b7887485595..9e509513ad9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested2.C
@@ -1,5 +1,5 @@
// Testcase from N2998
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
void f1(int i) {
int const N = 20;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C
index 2cc6f964083..f7894fb408c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested3.C
@@ -1,5 +1,5 @@
// PR c++/41896
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
void nested_lambda()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C
index a5bd1a2f4ee..140ed30e4fb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C
@@ -1,5 +1,5 @@
// PR c++/47687
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template <class T> struct A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C
index b6489de4b44..b5a335eaf13 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-const.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C
index 74149b23122..4a04cfbfb58 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nop.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
int main() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ns-scope.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ns-scope.C
index cde0c2e5379..4729bb3b30f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ns-scope.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ns-scope.C
@@ -1,5 +1,4 @@
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
auto f = [](int i) { return i+1; };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C
index 9dd64484a45..d904ebee16b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-pass.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
#include <algorithm>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C
index ef041c2bb90..40b539a6d88 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-qualified.C
@@ -1,5 +1,5 @@
// PR c++/50089
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
struct TestBase
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C
index 1a12eab312f..cbaeb16201f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-recursive.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
//#include <iostream>
#include <functional>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C
index 40376f43db3..6b86369dbf2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref-default.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C
index a5ee7b4c3c8..def13fdd67b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref.C
@@ -1,5 +1,4 @@
-// { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-do run { target c++11 } }
#include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref2.C
index 15f1d9034a3..49705f502bf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ref2.C
@@ -1,6 +1,5 @@
// PR c++/49598
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
int
main()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C
index f4433faec92..fcfc39e3eb6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow1.C
@@ -1,5 +1,6 @@
// PR c++/55357
-// { dg-options "-std=c++11 -Wshadow" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wshadow" }
int main() {
int x = 1; // { dg-message "shadowed" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow2.C
index 8237a8178c1..6c042ca677b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-shadow2.C
@@ -1,4 +1,5 @@
-// { dg-options "-std=c++11 -Wshadow" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wshadow" }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-std-function.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-std-function.C
index 26c09fdb119..a410384a451 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-std-function.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-std-function.C
@@ -1,6 +1,5 @@
// Test using std::function wrapper.
-// { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-do run { target c++11 } }
#include <functional>
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-switch.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-switch.C
index c3067713caf..1cac211dd4c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-switch.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-switch.C
@@ -1,5 +1,5 @@
// PR c++/49867
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
int
main ()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
index b3b749c2a51..cb3ca94eb78 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
@@ -1,5 +1,5 @@
// PR c++/46124
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
void foo() { [] () -> void (); } // { dg-error "returning a function" "returning" }
// { dg-error "expected .\{" "expected" { target *-*-* } 4 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template.C
index b4db3b881d1..66cc7a4e1df 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template.C
@@ -1,5 +1,4 @@
-// { dg-options -std=c++0x }
-// { dg-do run }
+// { dg-do run { target c++11 } }
extern "C" void abort();
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template10.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template10.C
index 4a804628728..4fcc9652751 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template10.C
@@ -1,6 +1,6 @@
// PR c++/50276
-// { dg-options "-std=c++11 -Wuninitialized" }
-// { dg-do run }
+// { dg-options "-Wuninitialized" }
+// { dg-do run { target c++11 } }
template<typename T>
unsigned testfun(const T& func)
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template2.C
index 12ffde724e8..29f63afe0df 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template2.C
@@ -1,5 +1,5 @@
// PR c++/47049
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
enum { E = 0, F = 1 };
template <int N, int M = ((N == 1) ? F : E)> class S {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template3.C
index fd6f1d3192f..dea9e0e4c09 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template3.C
@@ -1,5 +1,5 @@
// PR c++/49554
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template<typename T>
struct base
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this.C
index ed2747654f9..b32f8d7cc28 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this.C
@@ -1,5 +1,5 @@
// Test that implicit 'this' capture works, but that it's still an rvalue.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
struct A
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
index 04fe474c733..5029a4a7638 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
@@ -1,6 +1,6 @@
// PR c++/43856
// Test for implicit 'this' capture via rewriting.
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
struct S1 {
int operator()(int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this3.C
index de0d357f3ff..2defa998923 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this3.C
@@ -1,5 +1,5 @@
// PR c++/45520
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
struct M {
int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C
index 29cd2a97b3f..f14a2723dbc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this4.C
@@ -1,5 +1,5 @@
// PR c++/48523
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template<typename>
struct X
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C
index acf4eaa7fcb..8c35126e97f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C
@@ -1,5 +1,5 @@
// PR c++/53137
-// { dg-options -std=c++11 }
+// { dg-do compile { target c++11 } }
template <typename STORE>
void getParent(STORE& tStore)
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C
index 6e25c331b45..ee202032a18 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C
@@ -1,5 +1,5 @@
// PR c++/54122
-// { dg-options -std=c++11 }
+// { dg-do compile { target c++11 } }
enum E { F };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-type.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-type.C
index 3b2a2a76a46..a0c17ad162a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-type.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-type.C
@@ -11,7 +11,7 @@
// So, other appearances of 'x' within decltype do not refer to the closure
// member, because they are not "use"s in the sense of 3.2.
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template<class T, class U>
struct same_type;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-uneval.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-uneval.C
index 33ba7b0a436..898f685aa57 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-uneval.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-uneval.C
@@ -1,5 +1,5 @@
// 5.1.2/2: A lambda-expression shall not appear in an unevaluated operand.
-// { dg-options "-std=c++0x" }
+// { dg-do compile { target c++11 } }
template <class T>
struct A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use.C
index b1d6c300cfd..73677c0e767 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use.C
@@ -1,10 +1,10 @@
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
int main(int argc, char** argv)
{
int i;
int &ir = i;
- const int ci = 0;
+ const int ci = 1;
const int &cir = ci;
[] { sizeof (argc); sizeof (i); sizeof (ir); sizeof (ci); sizeof (cir); };
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use2.C
index 695a0b43292..96af09c5cbc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-use2.C
@@ -1,5 +1,6 @@
// PR c++/50224
-// { dg-options "-std=c++0x -Wunused-parameter" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wunused-parameter" }
struct T;
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic1.C
index f17b33618aa..e85f2bcff81 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic1.C
@@ -1,5 +1,5 @@
// PR c++/49672
-// { dg-options -std=c++0x }
+// { dg-do compile { target c++11 } }
template<typename ... Args>
static void foo()
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn1.C
index b384d5cff6d..f86c4b6d191 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn1.C
@@ -1,5 +1,6 @@
// PR c++/41920
-// { dg-options "-std=c++0x -Wall -Wextra" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wall -Wextra" }
int foo(int i)
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn2.C
index ce5e7c4503a..6542392ef1a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn2.C
@@ -1,5 +1,6 @@
// PR c++/42370
-// { dg-options "-std=c++0x -Wall" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wall" }
void foo()
{
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn3.C
index 77f35bc4630..5c5b24c133c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn3.C
@@ -1,5 +1,6 @@
// PR c++/49482
-// { dg-options "-std=c++0x -Wunused-but-set-parameter" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wunused-but-set-parameter" }
template<class T>
void f() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn4.C
index 2afeccfc03c..059c198ff09 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-warn4.C
@@ -1,5 +1,6 @@
// PR c++/52845
-// { dg-options "-std=c++11 -Wall" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wall" }
void f()
{
OpenPOWER on IntegriCloud