From: Mike Stump <mrs@gcc.gnu.org>
Date: Tue, 22 Oct 2013 23:23:51 +0000 (+0000)
Subject: ++0x -> ++11.
X-Git-Tag: releases/gcc-4.9.0~3295
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df2ba612878f96751235dae5f926f829d4245c92;p=thirdparty%2Fgcc.git

++0x -> ++11.

From-SVN: r203939
---

diff --git a/gcc/testsuite/g++.dg/cpp0x/Wliteral-suffix.C b/gcc/testsuite/g++.dg/cpp0x/Wliteral-suffix.C
index 39a8353561c0..520d77ef5c59 100644
--- a/gcc/testsuite/g++.dg/cpp0x/Wliteral-suffix.C
+++ b/gcc/testsuite/g++.dg/cpp0x/Wliteral-suffix.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Make sure -Wliteral-suffix is enabled by default and
 // triggers as expected.
diff --git a/gcc/testsuite/g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C b/gcc/testsuite/g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C
index aad273792ac9..9acfafe2be98 100644
--- a/gcc/testsuite/g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -Wzero-as-null-pointer-constant" }
+// { dg-options "-std=c++11 -Wzero-as-null-pointer-constant" }
 
 struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/__func__.C b/gcc/testsuite/g++.dg/cpp0x/__func__.C
index 1ac906515332..a7d5633614aa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/__func__.C
+++ b/gcc/testsuite/g++.dg/cpp0x/__func__.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 
 const char* foo()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/access01.C b/gcc/testsuite/g++.dg/cpp0x/access01.C
index 43e5e863720e..a6c86016146a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/access01.C
+++ b/gcc/testsuite/g++.dg/cpp0x/access01.C
@@ -1,5 +1,5 @@
 // PR c++/49042
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 class A
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-0.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-0.C
index f38f9932b44e..7f5d361a627d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-0.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-0.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<template<class> class TT> struct X { };
 template<class> struct Y { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-1.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-1.C
index cbba90fa1336..e3704d39f4a2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // These also represent tests for printing alias declarations and
 // their instantiations.
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-10.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-10.C
index 733e791c2bc6..b4e80f411c09 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-10.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <class T> using Ptr = T*;
 Ptr<unsigned>; // { dg-error "does not declare anything" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C
index 43ef7ba45e64..80795a8304db 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 namespace N
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-12.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-12.C
index 11c26865d9e8..758d180e1f91 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-12.C
@@ -1,4 +1,4 @@
 // Origin: PR c++/51027
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 using INT = int // { dg-error "expected|;|at end of input" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-13.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-13.C
index 8555154c6342..a7a55ddc168e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-13.C
@@ -1,5 +1,5 @@
 // Origin PR c++/51191
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< class T >
 class ClassTemplate {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-14.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-14.C
index 1a998022adcd..9e6b19cde938 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-14.C
@@ -1,5 +1,5 @@
 // Origin: PR c++/51145
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-15.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-15.C
index b23e4029f79c..6ef8bf7eb4a1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-15.C
@@ -1,5 +1,5 @@
 // Origin PR c++/51194
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class U, class V> //#1
 struct foo {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-2.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-2.C
index 6b5b42f7fde2..d8a71a481078 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T> struct S0 {};
 template<class T> using AS0 = S0<T>;
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-3.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-3.C
index 5484efce19eb..072cfb1f03a9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Exercise some member alias templates ...
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-4.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-4.C
index 876944e23c3e..c7da542189fa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // [temp.alias]/3:
 // The type-id in an alias template declaration shall not refer
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-5.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-5.C
index 1a4cbd5e5bc9..f57a67a0459b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-5.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // alias template of a partial specialization
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-6.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-6.C
index f60b2ea7fc0b..11440385c332 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-6.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Alias template of non-class types.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-7.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-7.C
index 96c349a0da6b..a1a6a362ec38 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-7.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Add arguments to unbound template template parameter.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-8.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-8.C
index c926df7539ba..80c2fdd67433 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-8.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A {
     template <class U> using C = U;
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-9.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-9.C
index dcf642d7683e..b4a23d0b853f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-9.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <class T>
 struct A {
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-debug-0.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-debug-0.C
index a9aae3749478..04e9b7065bf3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-debug-0.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-debug-0.C
@@ -1,6 +1,6 @@
 // Origin: PR c++/51032
 // { dg-skip-if "No stabs" { aarch64*-*-* mmix-*-* *-*-aix* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-vxworks* } { "*" } { "" } }
-// { dg-options "-std=c++0x -gstabs+" }
+// { dg-options "-std=c++11 -gstabs+" }
 
 template <class C>
 struct A {
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignof.C b/gcc/testsuite/g++.dg/cpp0x/alignof.C
index 8e8f715cdf3d..a0a556131caf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alignof.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alignof.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 int main(void)
 {
   static_assert(alignof(int) == __alignof(int), "alignof(int) does not equal __alignof(int)");
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignof2.C b/gcc/testsuite/g++.dg/cpp0x/alignof2.C
index 7c5aad3de296..9683a1eb6132 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alignof2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alignof2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 int main(void)
 {
   alignof(int); //ok with a type but not with an expression
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignof3.C b/gcc/testsuite/g++.dg/cpp0x/alignof3.C
index 50c6ac915e11..75eff1f8ae0b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alignof3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alignof3.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 int main(void)
 {
   alignof(void (void));   // { dg-warning "function type" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignof4.C b/gcc/testsuite/g++.dg/cpp0x/alignof4.C
index 92d636faf096..a05baa892951 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alignof4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alignof4.C
@@ -1,5 +1,5 @@
 // PR c++/51316
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto10.C b/gcc/testsuite/g++.dg/cpp0x/auto10.C
index 9b89291d6404..82e98ff8adc8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto10.C
@@ -1,6 +1,6 @@
 // Positive test for auto
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <typeinfo>
 extern "C" void abort();
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto11.C b/gcc/testsuite/g++.dg/cpp0x/auto11.C
index bd21daef0c65..05f5f5c20efd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto11.C
@@ -1,5 +1,5 @@
 // PR c++/38256
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto14.C b/gcc/testsuite/g++.dg/cpp0x/auto14.C
index cb2c4e0351a1..726fa05651d0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto14.C
@@ -1,5 +1,5 @@
 // PR c++/40306, c++/40307
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 template< typename T >
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto15.C b/gcc/testsuite/g++.dg/cpp0x/auto15.C
index b23e1e2fd6fd..1dca688a6edd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto15.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< typename Fn > struct function;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto16.C b/gcc/testsuite/g++.dg/cpp0x/auto16.C
index 1b4ae8f82b2b..3610662b951c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto16.C
@@ -1,5 +1,5 @@
 // PR c++/40619
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename U> struct X {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto17.C b/gcc/testsuite/g++.dg/cpp0x/auto17.C
index 03608d33ac63..f04b89f30ce7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto17.C
@@ -1,5 +1,5 @@
 // PR c++/42567
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename B>
 struct A {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto18.C b/gcc/testsuite/g++.dg/cpp0x/auto18.C
index 0a59242ab29c..a5c521c685bd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto18.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void f()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto19.C b/gcc/testsuite/g++.dg/cpp0x/auto19.C
index f7099028710d..66c0cfe05284 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto19.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Explicit {
   Explicit() = default;  // Line 2
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto2.C b/gcc/testsuite/g++.dg/cpp0x/auto2.C
index 626e9e245d48..cf6bcffbedff 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto2.C
@@ -1,6 +1,6 @@
 // Positive test for auto
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <typeinfo>
 extern "C" void abort();
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto20.C b/gcc/testsuite/g++.dg/cpp0x/auto20.C
index 90f875114a0f..8561b3d4a8a2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto20.C
@@ -1,6 +1,6 @@
 // Test for proper non-deduced context handling of the initializer
 // for an auto declaration/new.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct with_apply
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto21.C b/gcc/testsuite/g++.dg/cpp0x/auto21.C
index 1cbcac58d6a2..1d022b390e8a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto21.C
@@ -1,5 +1,5 @@
 // Origin PR c++/47208
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 constexpr auto list = { }; // { dg-error "deducing from brace-enclosed initializer list requires #include <initializer_list>" }
 static const int l = list.size();
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto22.C b/gcc/testsuite/g++.dg/cpp0x/auto22.C
index 66630e5367ff..301117836242 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto22.C
@@ -1,5 +1,5 @@
 // PR c++/47999
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int& identity(int& i)
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto23.C b/gcc/testsuite/g++.dg/cpp0x/auto23.C
index 49b5a0eb9e83..799445c8c3f1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto23.C
@@ -1,4 +1,4 @@
 // PR c++/46245
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<auto f()->int> struct A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto24.C b/gcc/testsuite/g++.dg/cpp0x/auto24.C
index b024ad5b2aba..3911c5887d41 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto24.C
@@ -1,5 +1,5 @@
 // PR c++/48599
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 int v[1];
 auto (*p)[1] = &v;		// { dg-error "array of .auto" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto25.C b/gcc/testsuite/g++.dg/cpp0x/auto25.C
index 2917c0e19783..0153d9c96fb3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto25.C
@@ -1,5 +1,5 @@
 // PR c++/42056
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto26.C b/gcc/testsuite/g++.dg/cpp0x/auto26.C
index 6e55aa451acd..9d0c89426d32 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto26.C
@@ -1,5 +1,5 @@
 // PR c++/43321
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 void f(T t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto28.C b/gcc/testsuite/g++.dg/cpp0x/auto28.C
index 8d250166a8c3..1d6f0d0293df 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto28.C
@@ -1,4 +1,4 @@
 // PR c++/51404
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int i = auto().x;  // { dg-error "invalid use of" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto4.C b/gcc/testsuite/g++.dg/cpp0x/auto4.C
index d47bca4369dd..71b0dede29ac 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto4.C
@@ -1,6 +1,6 @@
 // Testcase for deduction of std::initializer_list for auto.
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <typeinfo>
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto5.C b/gcc/testsuite/g++.dg/cpp0x/auto5.C
index ebe2df22e6fa..b5dd0d8a02c0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto5.C
@@ -1,5 +1,5 @@
 // Testcase for non-dependent auto in templates
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto7.C b/gcc/testsuite/g++.dg/cpp0x/auto7.C
index 3b3b82901681..d795c23baa51 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto7.C
@@ -1,6 +1,6 @@
 // PR c++/37965
 // Negative test for auto
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 auto i = 6;
 auto j;			// { dg-error "has no initializer" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto9.C b/gcc/testsuite/g++.dg/cpp0x/auto9.C
index f357f2b96636..ee6497921cd7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto9.C
@@ -1,7 +1,7 @@
 // PR c++/37962
 // Negative test for auto
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <typeinfo>
 #include <stdarg.h>
diff --git a/gcc/testsuite/g++.dg/cpp0x/bind.C b/gcc/testsuite/g++.dg/cpp0x/bind.C
index 42a2ac203dba..a0ce6b8ff624 100644
--- a/gcc/testsuite/g++.dg/cpp0x/bind.C
+++ b/gcc/testsuite/g++.dg/cpp0x/bind.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 struct S{};
 void f(S&&);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/bracket1.C b/gcc/testsuite/g++.dg/cpp0x/bracket1.C
index dfb5bf4ea401..abda40343743 100644
--- a/gcc/testsuite/g++.dg/cpp0x/bracket1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/bracket1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T>
 struct list {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/bracket2.C b/gcc/testsuite/g++.dg/cpp0x/bracket2.C
index 300015d01e6b..65cf2699c927 100644
--- a/gcc/testsuite/g++.dg/cpp0x/bracket2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/bracket2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<int i> class X { /* ... */ };
 X< 1>2 > x1;    // // { dg-error "numeric constant" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/bracket4.C b/gcc/testsuite/g++.dg/cpp0x/bracket4.C
index 0e1985ceff95..e6381c74c84d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/bracket4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/bracket4.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename T>
 struct vector { 
 };
diff --git a/gcc/testsuite/g++.dg/cpp0x/cast-bug.C b/gcc/testsuite/g++.dg/cpp0x/cast-bug.C
index 211f88b2b194..5485611dc65c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/cast-bug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/cast-bug.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 struct S
 {
   S();
diff --git a/gcc/testsuite/g++.dg/cpp0x/cast.C b/gcc/testsuite/g++.dg/cpp0x/cast.C
index 9cf97e688b04..2f109762c269 100644
--- a/gcc/testsuite/g++.dg/cpp0x/cast.C
+++ b/gcc/testsuite/g++.dg/cpp0x/cast.C
@@ -3,7 +3,7 @@
 // Test cast from lvalue to rvalue
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/collapse-bug.C b/gcc/testsuite/g++.dg/cpp0x/collapse-bug.C
index 02a59cd1d21f..93f2c9fc9b68 100644
--- a/gcc/testsuite/g++.dg/cpp0x/collapse-bug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/collapse-bug.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 template<typename T, typename U> struct same_type;
 template<typename T> struct same_type<T, T> {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/collapse.C b/gcc/testsuite/g++.dg/cpp0x/collapse.C
index 96c32732461f..98435f159d74 100644
--- a/gcc/testsuite/g++.dg/cpp0x/collapse.C
+++ b/gcc/testsuite/g++.dg/cpp0x/collapse.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 template<typename T, typename U> struct same_type;
 template<typename T> struct same_type<T, T> {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C
index 3c51c2cbf548..4268a6ba43a5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C
@@ -1,5 +1,5 @@
 // PR c++/46336
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern "C" {
   enum A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C
index 757a6e315b0d..c59949aa68e4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-46420.C
@@ -1,5 +1,5 @@
 // PR c++/46420
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename> class vector { };
 struct A{};
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-47570.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-47570.C
index c60ba8658622..53c20a623826 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-47570.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-47570.C
@@ -1,5 +1,5 @@
 // PR c++/47570
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 unsigned int constexpr one()
 { return 1; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-47969.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-47969.C
index c950a3642fe4..140965150a19 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-47969.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-47969.C
@@ -1,5 +1,5 @@
 // PR c++/47969
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-48089.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-48089.C
index a6cf4080756c..039411ef58d6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-48089.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-48089.C
@@ -1,5 +1,5 @@
 // PR c++/48089
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 // bang is ill-formed (diagnostic required) because its initializer is
 // non-constant, because it uses the value of an uninitialized object.
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-49776.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-49776.C
index 3fe3dcb86c1b..8f407191192f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-49776.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-49776.C
@@ -1,5 +1,5 @@
 // PR c++/49776
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct s
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C
index e83f142300ae..c596a4386a9c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C
@@ -1,5 +1,5 @@
 // PR c++/47301
-// { dg-options "-std=c++0x -fabi-version=1" }
+// { dg-options "-std=c++11 -fabi-version=1" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-access.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-access.C
index ee5fc9854fc5..3cde1efa9142 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-access.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-access.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class base
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr.C
index 36939e1afe14..db95e569492b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 constexpr T do_get(T* x, int n) {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr2.C
index 7cf733445d91..23c6ebdaf6a3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 struct IsNegative {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr3.C
index f84cb5257741..a282b85490b9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr bool is_negative(int x) {
   return x < 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr4.C
index 697d2d9f708b..f530265863da 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr const int do_last(const int* x, int n) {
  return x[n - 1];
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr5.C
index d58f254f6c8d..20b6344e4909 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 constexpr T do_last(T* x, int n) {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr6.C
index 17dd6e50be91..c307edba6e17 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr6.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 typedef decltype(sizeof(char)) size_type;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr7.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr7.C
index 44775c0703c5..7c83178a9b53 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr7.C
@@ -1,5 +1,5 @@
 // PR c++/49290
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef unsigned T;
 struct S
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-tparm.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-tparm.C
index c17090cc3b49..4b6a3df1892a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-tparm.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-tparm.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <const int I[2]> struct A { int ir[I[0]]; };
 extern constexpr int ar[2] = { 1, 2 };
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array.C
index e37400a8bda8..f2c8ddcc9662 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler-not "static_initialization" } }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array2.C
index 9577f75d9fd8..4f556ae66613 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array2.C
@@ -1,5 +1,5 @@
 // PR c++/46348
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<__SIZE_TYPE__ _Nw>
   struct _Base
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array3.C
index 145a4307e366..38314ec0f5ff 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array3.C
@@ -1,5 +1,5 @@
 // PR c++/48132
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct C
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array4.C
index 9aeb75d6b064..0658be9011f0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array4.C
@@ -1,5 +1,5 @@
 // PR c++/49924
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { constexpr A() { } };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute.C
index ac85c076d3ea..fef7007cf0c0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-attribute.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 //A few constexpr's
 constexpr int foo() { return __alignof__(int); }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-auto.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-auto.C
index ddf0da0b9b4b..60bd55897457 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-auto.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-auto.C
@@ -1,2 +1,2 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 constexpr auto value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-base.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-base.C
index 774df318ab66..b159bb8dba4b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-base.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-base.C
@@ -1,5 +1,5 @@
 // Test base/member class and static_assert with constexpr
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C
index 3ea75432a226..9849f206c541 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-base2.C
@@ -1,5 +1,5 @@
 // PR c++/46293
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-base3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-base3.C
index cffe9ea240c7..ec6646bc560f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-base3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-base3.C
@@ -1,6 +1,6 @@
 // PR c++/46526
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct Base
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-base4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-base4.C
index ce23cb9dd109..8a061bfd27ea 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-base4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-base4.C
@@ -1,6 +1,6 @@
 // PR c++/46626
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield.C
index 7eba49833f27..5025f4782d1e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield.C
@@ -1,5 +1,5 @@
 // PR c++/46369
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield2.C
index 531bf31fc01c..6ad5aeab5864 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield2.C
@@ -1,6 +1,6 @@
 // PR c++/49136
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct day
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield3.C
index b0ecbfb9abb7..6b20e707f7bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-bitfield3.C
@@ -1,6 +1,6 @@
 // PR c++/49136
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-builtin1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-builtin1.C
index b3f5576360b2..ef2762e7cdbc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-builtin1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-builtin1.C
@@ -1,5 +1,5 @@
 // PR c++/49813
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 inline constexpr bool
 isinf(long double __x)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-cache1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-cache1.C
index b6d7b6471395..7c128df7b1bd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-cache1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-cache1.C
@@ -1,5 +1,5 @@
 // PR c++/51433
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr int f();
 constexpr int g() { return f(); }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-cleanup.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-cleanup.C
index de17f3ddb256..ff86b1bdbcee 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-cleanup.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-cleanup.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-complex.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-complex.C
index eee773ef3085..0d4ea010cb37 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-complex.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-complex.C
@@ -1,5 +1,5 @@
 // Make sure C99 complex works with constexpr
-// { dg-options -std=gnu++0x }
+// { dg-options -std=gnu++11 }
 
 struct complex
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-compound.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-compound.C
index 81fcc54b3e68..006a8c776134 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-compound.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-compound.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 constexpr int f()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-condition.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-condition.C
index e2328fcc578a..dd47a79433de 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-condition.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-condition.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // Core DR 948
 
 constexpr int something() { return 3; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-condition2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-condition2.C
index 243409669bf0..855c8dcea2a8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-condition2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-condition2.C
@@ -1,5 +1,5 @@
 // PR c++/48909
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert((X),#X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor.C
index 91c489db230d..23076b3ac344 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor2.C
index 5280b131b7b8..02333734bb29 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor3.C
index d5bfbad3d67e..23159839c01b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor3.C
@@ -1,5 +1,5 @@
 // PR c++/46348
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor4.C
index 397b4b054eff..96b99e320adf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor4.C
@@ -1,5 +1,5 @@
 // PR c++/46873
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor5.C
index 36b01785feec..63d4b151d71f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor5.C
@@ -1,5 +1,5 @@
 // PR c++/46877
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct new_allocator
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor6.C
index 4f86f73a4581..405129750031 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor6.C
@@ -1,5 +1,5 @@
 // PR c++/47041
-// { dg-options "-std=c++0x -fno-elide-constructors" }
+// { dg-options "-std=c++11 -fno-elide-constructors" }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C
index 8338bf1f7ec4..8a65ad2f34e6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor7.C
@@ -1,5 +1,5 @@
 // PR c++/47199
-// { dg-options "-std=c++0x -fno-elide-constructors" }
+// { dg-options "-std=c++11 -fno-elide-constructors" }
 
 template < int > struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor8.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor8.C
index 81fc83737bc0..4d204a17336e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor8.C
@@ -1,5 +1,5 @@
 // PR c++/46466
-// { dg-options "-std=c++0x -fno-elide-constructors" }
+// { dg-options "-std=c++11 -fno-elide-constructors" }
 
 struct S { bool b; };
 constexpr S f() { return S{true}; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor9.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor9.C
index b7693f1e637f..9d7e88de0de0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor9.C
@@ -1,5 +1,5 @@
 // PR c++/47774
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-data1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-data1.C
index 0943fa4225dc..f2a4d443514c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-data1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-data1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-data2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-data2.C
index 2d614ec32eda..47967ab416e0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-data2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-data2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename _Tp, _Tp v>
   struct A3
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
index 8c46fab33341..1af0662ff53b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
@@ -1,5 +1,5 @@
 // PR c++/46930
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S {
   static constexpr int size;	// { dg-error "must have an initializer" "must have" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C
index 1413b24bd842..22ccedd13598 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C
@@ -1,5 +1,5 @@
 // PR c++/46335
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct T { };
 struct A {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg2.C
index faa8a3603ff1..4a02336647ce 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg2.C
@@ -1,5 +1,5 @@
 // PR c++/46368
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-default-ctor.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-default-ctor.C
index d3868b599ac5..02f695853db5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-default-ctor.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-default-ctor.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating.C
index a02088876716..571e58f3de65 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating.C
@@ -1,5 +1,5 @@
 // PR c++/51526
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 const int j = 42;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating2.C
index c85ed2e81917..8115baa1aa1c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-delegating2.C
@@ -1,5 +1,5 @@
 // PR c++/51723
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <int... V>
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-delete.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-delete.C
index 67c9503025b5..5eb478d851c4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-delete.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-delete.C
@@ -1,3 +1,3 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr bool never() = delete; // useless, but OK
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-deref.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-deref.C
index 7363e98ecb8f..29adab9f23ed 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-deref.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-deref.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
index cbd4983e84b0..21213eb5eb4e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
@@ -1,5 +1,5 @@
 // Test that we explain why a template instantiation isn't constexpr
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag2.C
index c78416ec1a33..161b5a7bdfb8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag2.C
@@ -1,5 +1,5 @@
 // PR c++/47207
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr int X (X);		// { dg-error "not usable" }
 // { dg-message "own initializer" "" { target *-*-* } 4 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag3.C
index 100c17edb45c..0a0887fd6c1f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag3.C
@@ -1,5 +1,5 @@
 // PR c++/45923
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int f(int);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-eh-spec.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-eh-spec.C
index 6d231fafadbc..45fee3bc032d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-eh-spec.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-eh-spec.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 template<class T> class my_limits {
 public:
   static constexpr T min() throw() { return T(); }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis.C
index 5d090b541d46..55f8fa5322f9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 constexpr int ellipsis(...) { return 1; }
 
 constexpr int ellipsis_c = ellipsis(); // OK
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis2.C
index 0bb6904061f9..d6b44828e150 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ellipsis2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty.C
index a9fc4388a34b..6a5565fc3f43 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Empty {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty2.C
index ef2121194473..5e6694d9953b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct IsLiteral {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty3.C
index e0026fcc7603..133ad42e36d8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct IsLiteral {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty4.C
index b07f924649d6..3b7380d12843 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef decltype(sizeof(char)) size_type;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty5.C
index 9bd9aa583dca..f693cc196f62 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-empty5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-empty5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { };
 struct B: A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
index 3df7956fd28d..acf8bccc176b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex2.C
index 29e835c4bbb4..a760a729022c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
index 5c0b1e21cb7d..1cda29b3b8d6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -ftrack-macro-expansion=0" }
+// { dg-options "-std=c++11 -ftrack-macro-expansion=0" }
 
 #define SA(X) static_assert (X, #X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex4.C
index 4214f5c52ded..13089043c3b8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-expinst.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-expinst.C
index 208987369832..d8ba4193e7c7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-expinst.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-expinst.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // Error: Explicit instantiation of a function template shall not use the
 // inline or constexpr specifiers
 template<class T> constexpr inline T bar(T x) { return x; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-explicit-inst.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-explicit-inst.C
index 8f0da0af0c53..652104172264 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-explicit-inst.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-explicit-inst.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T> constexpr inline T bar(T x) { return x; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-fnptr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-fnptr.C
index 4c84d827f074..a81ce5a1378e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-fnptr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-fnptr.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr bool is_negative(int x) { return x < 0; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-friend.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-friend.C
index 57782cf349a6..ee35f1ff98a6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-friend.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-friend.C
@@ -1,5 +1,5 @@
 // PR c++/48948
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { A(); };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-function1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-function1.C
index c708b040f806..e4cddf7ea965 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-function1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-function1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
index 6403ea16e87e..5dda09305db0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-function2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-function3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-function3.C
index e8ca7bc68c9a..bd35e97d1b89 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-function3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-function3.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-generated1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-generated1.C
index 73ddc8f5c2e8..e66d33286f13 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-generated1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-generated1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice.C
index 3b72484a0055..aca701531a1d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice.C
@@ -1,5 +1,5 @@
 // We used to crash on this instead of giving a decent error.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { int i; };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice2.C
index 856246fcc95a..952c6fdcc4c8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice2.C
@@ -1,3 +1,3 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 int x;
 constexpr int& rx = x;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice3.C
index 23903bca78d6..1a66840080eb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice3.C
@@ -1,5 +1,5 @@
 // PR c++/46289
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice4.C
index e1ee36dfc905..35109e8d04f1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice4.C
@@ -1,5 +1,5 @@
 // PR c++/51612
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice5.C
index b88ec66c9f6f..56936b0ba65a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice5.C
@@ -1,5 +1,5 @@
 // PR c++/51621
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice6.C
index 1a494bb32361..3512261cd312 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice6.C
@@ -1,5 +1,5 @@
 // PR c++/51327
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete1.C
index 3f40e29aec07..179566ba5038 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete2.C
index f61535f06be5..96de0c37243e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete2.C
@@ -1,6 +1,6 @@
 // A constructor that might or might not be constexpr still makes
 // its class literal.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 struct B
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete3.C
index 81822b07e2fa..26ffd3e1fbd3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-incomplete3.C
@@ -1,5 +1,5 @@
 // PR c++/49015
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist.C
index 6854e7341b74..982332b82c79 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 namespace xstd {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist2.C
index f34b9801607f..7a75e5ff2717 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist3.C
index 7620e6b2c96d..4909a082976e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 #define SA(X) static_assert(X,#X)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist4.C
index 815185756925..a45e8cdcf3c5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { int i; };
 struct B: A { constexpr B(): A{} {} };
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist5.C
index 97f039998024..9ddc9f8ab369 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist5.C
@@ -1,5 +1,5 @@
 // PR c++/50024
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template< class T >
 struct Container
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-is_literal.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-is_literal.C
index 82514ed865a5..6423588fd7f9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-is_literal.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-is_literal.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <type_traits>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C
index ef7ac6b4842a..10a0aaa2f08a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-memfn1.C
@@ -1,5 +1,5 @@
 // PR c++/48296
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-missing.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-missing.C
index 547f552e3775..6f1d1a23653b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-missing.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-missing.C
@@ -1,6 +1,6 @@
 // PR c++/48911
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #define SA(X) static_assert((X),#X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-mutable1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-mutable1.C
index a14d611cee82..3d595d5d9258 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-mutable1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-mutable1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
index c27615f05ad6..8e1bcd0f2f97 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-neg1.C
@@ -1,5 +1,5 @@
 // Negative examples from N3092 (FCD)
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 // OK: declaration
 constexpr int square(int x);	// { dg-message "never defined" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept.C
index 0476f9096545..9e337793092f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 struct is_funny {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept2.C
index 95a1443fa282..e4e998b50d4c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 constexpr T value(T t) { return t; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept3.C
index 6e76ea8fa0b5..1cda35218971 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr int f(int i) { return i; }
 #define SA(X) static_assert (X, #X)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept4.C
index 119d4e167305..b19c1575acfa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // A call is noexcept if it is a valid subexpression of a constant
 // expression, even if it is not itself a constant expression.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept5.C
index 7bf961b3c452..52f2040b90bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct booleable {
   bool data;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept6.C
index 91e93fd91bc7..56dc68308ca8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept6.C
@@ -1,5 +1,5 @@
 // PR c++/51305
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr bool ok() noexcept
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
index 7637c0a05bc5..c8bdb28384b9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg.C
@@ -1,6 +1,6 @@
 // Example from issue 1125 drafting; D() and v were well-formed with the
 // wording approved in Rapperswil, now seems they should be ill-formed.
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 struct B {
   constexpr B(int x) : i(0) { }    // "x" is unused
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg2.C
index 20e05c3c0681..02ec95f7e9e6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg2.C
@@ -1,5 +1,5 @@
 // PR c++/47200
-// { dg-options "-std=c++0x -w" }
+// { dg-options "-std=c++11 -w" }
 
 template < int > struct duration
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C
index 581be6d15ce8..3a9c92c40118 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C
@@ -1,5 +1,5 @@
 // PR c++/49988
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 template<int ... I> struct X { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit.C
index 9104c8afac64..21036d8e7d03 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit.C
@@ -1,5 +1,5 @@
 // FIXME this is currently invalid, but seems like it should be OK
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { A() { } };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit2.C
index 21e8bd509619..77ceefe05693 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonlit2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonstatic.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonstatic.C
index 3951fbdb15cd..110edd4db109 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nonstatic.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nonstatic.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
index 6381323cc0ca..77b56af049d3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr int zero() { return 0; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
index 6c9d46644182..f5c319ad9d61 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // From N2235
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-object2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-object2.C
index a038970f6a49..9234ad218e2f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-object2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-object2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 constexpr int verysquare(int x) { return x * x; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow.C
index 3eb27aa0a88b..b9f82470727a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -w -ftrack-macro-expansion=0" }
+// { dg-options "-std=c++11 -w -ftrack-macro-expansion=0" }
 
 #include <limits.h>
 extern constexpr int max_s = INT_MAX + 1;  // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow2.C
index 5d5749ce2c3a..8534f5f9376f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow2.C
@@ -1,5 +1,5 @@
 // PR c++/47504
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 char constexpr sub(char arg)
 { return char(arg - char(1)); }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-pedantic.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-pedantic.C
index dc393d75915e..84ff462abc7c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-pedantic.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-pedantic.C
@@ -1,6 +1,6 @@
 // The FCD doesn't allow typedefs and static_assert in constexpr functions,
 // but it should.
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 
 template <class T>
 constexpr T f(T t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-pos1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-pos1.C
index 775080acce69..c234f4a8c346 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-pos1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-pos1.C
@@ -1,5 +1,5 @@
 // Positive examples from N3092 (FCD)
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert(X, #X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-potential1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-potential1.C
index e933506b8a16..85a26f0886a4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-potential1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-potential1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // We decided in Rapperswil that it's OK if any value of decide can produce
 // a constant expression.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrmem.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrmem.C
index f6ed2f40afb5..8a1c5517bd4c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrmem.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrmem.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct C { // literal type
   int m;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrsub.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrsub.C
index bccec73bb0b7..a7c79d7456d1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrsub.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ptrsub.C
@@ -1,6 +1,6 @@
 // PR c++/51489
 // DR 1313
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct array
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-pure.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-pure.C
index e17e02a42207..556b4e7cb3f8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-pure.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-pure.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion.C
index 2f9b4887df6d..327efa44648e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion.C
@@ -1,5 +1,5 @@
 // Test that we catch excessive recursion.
-// { dg-options "-std=c++0x -fconstexpr-depth=5" }
+// { dg-options "-std=c++11 -fconstexpr-depth=5" }
 // { dg-prune-output "in constexpr expansion" }
 constexpr int f (int i) { return f (i-1); }
 constexpr int i = f(42);	// { dg-error "constexpr evaluation depth" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref1.C
index 482e1ba3691f..0c10b4b55788 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref1.C
@@ -1,5 +1,5 @@
 // PR c++/49172
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert((X),#X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref2.C
index 2a86eb765cb2..5091593056f0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref2.C
@@ -1,5 +1,5 @@
 // Negative reference variable tests.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern int *p;
 constexpr int& ri = *p;		// { dg-error "p" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref3.C
index 24cc9c824494..37222525e600 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref3.C
@@ -1,5 +1,5 @@
 // PR c++/50298
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int global_variable;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C
index 6ae355a273f5..c256814a3ade 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C
@@ -1,5 +1,5 @@
 // PR c++/54777
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-rom.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-rom.C
index a6aa34eb2f54..0f5384a9062b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-rom.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-rom.C
@@ -1,5 +1,5 @@
 // PR c++/49673: check that test_data goes into .rodata
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-additional-options -G0 { target { { alpha*-*-* frv*-*-* ia64-*-* lm32*-*-* m32r*-*-* microblaze*-*-* mips*-*-* powerpc*-*-* rs6000*-*-* score*-*-* } && { ! { *-*-darwin* *-*-aix* alpha*-*-*vms* } } } } }
 // { dg-final { scan-assembler "\\.rdata" { target mips*-*-* } } }
 // { dg-final { scan-assembler "rodata" { target { { *-*-linux-gnu *-*-gnu* *-*-elf } && { ! mips*-*-* } } } } }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C
index 3e08fb0efa36..b9b5003a06fe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C
@@ -1,5 +1,5 @@
 // Allow static_assert in constexpr constructors, too.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T>
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static.C
index 8ed2b5e82edc..aa96499b2846 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static.C
@@ -1,5 +1,5 @@
 // Test for constant initialization of non-literal class (e.g. mutex)
-// { dg-options "-std=c++0x -save-temps" }
+// { dg-options "-std=c++11 -save-temps" }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static2.C
index 67c353080241..2ed8147ff1d6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 struct IsLiteral {};
 
 struct ShouldBeLiteral {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static3.C
index dccdc854b395..1951edbf43bf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static3.C
@@ -1,5 +1,5 @@
 // Test for constant initialization of class with vtable
-// { dg-options "-std=c++0x -save-temps" }
+// { dg-options "-std=c++11 -save-temps" }
 // { dg-final { scan-assembler-not "static_initialization" } }
 // { dg-final cleanup-saved-temps }
 // { dg-do run }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static4.C
index 8189fc5de479..aa060b8d43d1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 extern "C" void abort ();
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static5.C
index a401cc0b8901..886e693d52c5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static6.C
index a34704d839c4..cf64979a9a94 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static6.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct B
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static7.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static7.C
index e46ddafd7028..bb333b7d8972 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static7.C
@@ -1,5 +1,5 @@
 // PR c++/48945
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   static constexpr bool is();
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static8.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static8.C
index 7c84cf8b07bb..c6fd94e9c742 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-static8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static8.C
@@ -1,5 +1,5 @@
 // PR c++/50258
-// { dg-options "-std=c++0x -fpermissive" }
+// { dg-options "-std=c++11 -fpermissive" }
 
 struct Foo {
   static const double d = 3.14; // { dg-warning "constexpr" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-stmtexpr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-stmtexpr.C
index 40e0c2d65d04..562cf760872b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-stmtexpr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-stmtexpr.C
@@ -1,5 +1,5 @@
 // PR c++/46977
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template < typename > void
 foo ()
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-string.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-string.C
index e76d00d7e630..a7132e1c8123 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-string.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-string.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr char c1 = "hi"[1];
 constexpr char c2 = "hi"[2];
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-switch.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-switch.C
index d229304e419c..705d3553c45d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-switch.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-switch.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 constexpr T value(T t = T()) { return t; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-switch2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-switch2.C
index 55cf2ad7ce84..a59e7671979b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-switch2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-switch2.C
@@ -1,5 +1,5 @@
 // Test for constexpr conversion in case context
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class E { e1, e2 };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-synth1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-synth1.C
index 9830939806b9..1e7a92a82c85 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-synth1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-synth1.C
@@ -1,5 +1,5 @@
 // PR c++/46472
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T> struct A {
   T t;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-targ.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-targ.C
index 0c8c73d2e1d0..ba97ab7f4c21 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-targ.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-targ.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template1.C
index 88077231b0dd..d109229f0024 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-template1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template1.C
@@ -1,5 +1,5 @@
 // PR c++/50248, DR 1358
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class Elt, unsigned max>
 struct earray
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template2.C
index 6786d1651e57..368edb507053 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-template2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template3.C
index 75b2fc4634e2..66fcb2a77265 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-template3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { constexpr operator int() { return 42; } };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
index f1ef9dc7d0dc..7f06080c476d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-throw.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr int may_throw(bool decide) {
 	return decide ? 42 : throw -1; // { dg-error "throw" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-typedef1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-typedef1.C
index 2719e3aea12a..98f25ecf5ba8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-typedef1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-typedef1.C
@@ -1,5 +1,5 @@
 // PR c++/50508
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
   struct integral_constant {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-typeid.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-typeid.C
index b523bb38cc1b..d72dc5a3f7aa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-typeid.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-typeid.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-union.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-union.C
index 3c7a7f38ec89..53cecfaeb468 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-union.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-union.C
@@ -1,6 +1,6 @@
 // Test that we don't have to deal with type punning
 // DR 1188 says this is ill-formed
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 union U
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-union2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-union2.C
index 0bf2aa7e2bc5..2ae7e40dacf4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-union2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-union2.C
@@ -1,5 +1,5 @@
 // PR c++/51675
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 union foo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-using.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-using.C
index fc794e9abdf0..a28d15eb7811 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-using.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-using.C
@@ -1,5 +1,5 @@
 // Core issue 898
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace N { const int i = 42; }
 namespace M { const int j = 42; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-using2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-using2.C
index 6b282813e558..18272a6faf6d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-using2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-using2.C
@@ -1,5 +1,5 @@
 // PR c++/49520
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace x { void foo(); }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-value.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-value.C
index 85799d90b684..2004a779d73b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-value.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-value.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct HopefullyLiteral {
   HopefullyLiteral() = default; // Should be a constexpr c'tor as of 12.1/6 and 8.4.2/4
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-value2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-value2.C
index 1b0e28f162dc..1be6a08dda3a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-value2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-value2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 constexpr T value_init() { return T(); }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-value3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-value3.C
index 38d89936ec4d..57fe868cd470 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-value3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-value3.C
@@ -1,5 +1,5 @@
 // PR c++/50234
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert((X),#X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-variadic.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-variadic.C
index 5d0ad05941e0..c2be32727342 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-variadic.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-variadic.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 template<class... T>
 constexpr bool variadics(T&&...) { return true; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-virtual.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-virtual.C
index 448ecb1dc702..22ad73d50c99 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-virtual.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-virtual.C
@@ -1,5 +1,5 @@
 // PR c++/47067
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X {
     virtual void x();
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring1.C
index 059977bfff91..0195a863fde5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring1.C
@@ -1,6 +1,6 @@
 // PR c++/48570
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 extern "C" void abort ();
 constexpr wchar_t foo (int i) { return L"0123"[i]; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring2.C
index 4fc8980ef96c..586e0baa5e82 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-wstring2.C
@@ -1,6 +1,6 @@
 // PR c++/48570
 // { dg-do compile }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr wchar_t c1 = L"hi"[3];	// { dg-error "out of bound" }
 constexpr char16_t c2 = u"hi"[3];	// { dg-error "out of bound" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/dc1.C b/gcc/testsuite/g++.dg/cpp0x/dc1.C
index ba2e4f4fd05e..c1a5f39dce30 100644
--- a/gcc/testsuite/g++.dg/cpp0x/dc1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/dc1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options --std=c++0x }
+// { dg-options --std=c++11 }
 
 struct B {
 	int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/dc2.C b/gcc/testsuite/g++.dg/cpp0x/dc2.C
index dda0b9fc697e..227bab137052 100644
--- a/gcc/testsuite/g++.dg/cpp0x/dc2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/dc2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options --std=c++0x }
+// { dg-options --std=c++11 }
 
 struct A {
 	int i, j;
diff --git a/gcc/testsuite/g++.dg/cpp0x/dc3.C b/gcc/testsuite/g++.dg/cpp0x/dc3.C
index b411c997d8fc..c68d622d2028 100644
--- a/gcc/testsuite/g++.dg/cpp0x/dc3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/dc3.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options --std=c++0x }
+// { dg-options --std=c++11 }
 
 struct X {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/dc5.C b/gcc/testsuite/g++.dg/cpp0x/dc5.C
index 0052b3211139..59cf2ea17851 100644
--- a/gcc/testsuite/g++.dg/cpp0x/dc5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/dc5.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 
 #include <cassert>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-1212.C b/gcc/testsuite/g++.dg/cpp0x/decltype-1212.C
index 38393d3b874b..24bf339a5166 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype-1212.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-1212.C
@@ -1,5 +1,5 @@
 // Core 1212
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T, class U> struct assert_same_type;
 template <class T> struct assert_same_type<T,T> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-33837.C b/gcc/testsuite/g++.dg/cpp0x/decltype-33837.C
index 2c263dd0a97f..7f85bc32c928 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype-33837.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-33837.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // PR c++/33837
 void foo()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-33838.C b/gcc/testsuite/g++.dg/cpp0x/decltype-33838.C
index 260a0d1cf09c..8f4a86c12ad0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype-33838.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-33838.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // PR c++/33838
 template<typename T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-refbug.C b/gcc/testsuite/g++.dg/cpp0x/decltype-refbug.C
index 8e3c82407245..d58011b2a313 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype-refbug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-refbug.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/33045
 int && f ();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype1.C b/gcc/testsuite/g++.dg/cpp0x/decltype1.C
index d1288e07d932..7b268fdbca06 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype10.C b/gcc/testsuite/g++.dg/cpp0x/decltype10.C
index 6c488998c59a..381f6363b3aa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype10.C
@@ -1,6 +1,6 @@
 // PR c++/34271
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype11.C b/gcc/testsuite/g++.dg/cpp0x/decltype11.C
index ac32d349a6c9..01a65568d9e8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype11.C
@@ -1,5 +1,5 @@
 // PR c++/35316
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype12.C b/gcc/testsuite/g++.dg/cpp0x/decltype12.C
index 77c794bcf09c..c39f6f103cdb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype12.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename T, typename U>
 struct is_same
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype15.C b/gcc/testsuite/g++.dg/cpp0x/decltype15.C
index 5c2d445debf0..e0348ea9a382 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype15.C
@@ -1,6 +1,6 @@
 // PR c++/38640
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int N> void foo (decltype (N));
 template<long int N> void foo (decltype (N));
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype16.C b/gcc/testsuite/g++.dg/cpp0x/decltype16.C
index 2002458b8515..9f2398ece1f6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype16.C
@@ -1,5 +1,5 @@
 // PR c++/39070
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename X> struct junk {
    template<typename Z> static Z y();
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype17.C b/gcc/testsuite/g++.dg/cpp0x/decltype17.C
index 7f36ff01e500..c3a445359743 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype17.C
@@ -1,5 +1,5 @@
 // PR c++/36628
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 #include <typeinfo>
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype18.C b/gcc/testsuite/g++.dg/cpp0x/decltype18.C
index 0d44586e9d26..0f639a0cdfbc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype18.C
@@ -1,5 +1,5 @@
 // PR c++/37875
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename> struct X {};
 X<decltype(1 > 2)> x;
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype2.C b/gcc/testsuite/g++.dg/cpp0x/decltype2.C
index e0c590030470..81cb56b7ed97 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype20.C b/gcc/testsuite/g++.dg/cpp0x/decltype20.C
index 3155cdcf86a4..bba848ccc41a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype20.C
@@ -1,5 +1,5 @@
 // PR c++/42277
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S { int s; };
 template <int N>
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype21.C b/gcc/testsuite/g++.dg/cpp0x/decltype21.C
index 733725626c35..a6e973ff88f8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype21.C
@@ -1,6 +1,6 @@
 // PR c++/6709 (DR 743)
 // PR c++/42603 (DR 950)
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 T make();
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype22.C b/gcc/testsuite/g++.dg/cpp0x/decltype22.C
index 74811cfe701c..623163f4b14c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype22.C
@@ -1,5 +1,5 @@
 // PR c++/42761
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename _Tp> _Tp* fn();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype23.C b/gcc/testsuite/g++.dg/cpp0x/decltype23.C
index 78eb89d8ee25..a2543243a525 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype23.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int x, &&y = static_cast<int &&>(x);
 typedef decltype((y)) myInt;  // `y' is a parenthesized id-expression of type int that is an lvalue
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype24.C b/gcc/testsuite/g++.dg/cpp0x/decltype24.C
index 16d0736d66fd..3b3a7d59718f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype24.C
@@ -1,5 +1,5 @@
 // PR c++/47068
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> struct broken {
   int member;
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype25.C b/gcc/testsuite/g++.dg/cpp0x/decltype25.C
index c9559f1511a0..04465b90220b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype25.C
@@ -1,5 +1,5 @@
 // PR c++/47851
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Type {
   void display_type();
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype26.C b/gcc/testsuite/g++.dg/cpp0x/decltype26.C
index a81d411558c3..705fd64e51e7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype26.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype27.C b/gcc/testsuite/g++.dg/cpp0x/decltype27.C
index cb962ada525e..0f0cd42168bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype27.C
@@ -1,5 +1,5 @@
 // PR c++/48617
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T, decltype(T())> // #
 struct A {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype28.C b/gcc/testsuite/g++.dg/cpp0x/decltype28.C
index 00457357b2b7..591bb03b573f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype28.C
@@ -1,5 +1,5 @@
 // PR c++/44175
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <bool, class T> struct enable_if { };
 template <class T> struct enable_if <true, T> { typedef T type; };
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype29.C b/gcc/testsuite/g++.dg/cpp0x/decltype29.C
index a64bb65a476f..ae1cb2ab2fcf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype29.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype29.C
@@ -1,5 +1,5 @@
 // PR c++/44175
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <bool, class T> struct enable_if { };
 template <class T> struct enable_if <true, T> { typedef T type; };
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype3.C b/gcc/testsuite/g++.dg/cpp0x/decltype3.C
index b44dd17c8ead..57300566e3be 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype3.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype30.C b/gcc/testsuite/g++.dg/cpp0x/decltype30.C
index b23c9a94d8fe..2e7283e55d73 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype30.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype30.C
@@ -1,5 +1,5 @@
 // PR c++/49369
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class,class> struct assert_same;
 template <class T> struct assert_same<T,T> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype31.C b/gcc/testsuite/g++.dg/cpp0x/decltype31.C
index b9817eb9e130..ce03ec11cc8e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype31.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype31.C
@@ -1,5 +1,5 @@
 // PR c++/49921
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Local
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype32.C b/gcc/testsuite/g++.dg/cpp0x/decltype32.C
index c5f3a55c6d20..a53f9d05469b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype32.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype32.C
@@ -1,5 +1,5 @@
 // PR c++/50075
-// { dg-options "-std=c++0x -ftemplate-depth=10" }
+// { dg-options "-std=c++11 -ftemplate-depth=10" }
 
 template <typename T>
 auto make_array(const T& il) ->
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype33.C b/gcc/testsuite/g++.dg/cpp0x/decltype33.C
index d022d166482b..935423ab5551 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype33.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype33.C
@@ -1,5 +1,5 @@
 // PR c++/50084
-// { dg-options "-std=c++0x -fno-inline" }
+// { dg-options "-std=c++11 -fno-inline" }
 
 template<typename>   struct remove_reference;
 template<typename T> struct remove_reference<T&> { typedef T type; };
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype34.C b/gcc/testsuite/g++.dg/cpp0x/decltype34.C
index fbd15c2797d8..9d7c31828258 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype34.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype34.C
@@ -1,5 +1,5 @@
 // PR c++/50870
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 struct impl
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype35.C b/gcc/testsuite/g++.dg/cpp0x/decltype35.C
index d1fd47638a94..ee9537d97eb0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype35.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype35.C
@@ -1,5 +1,5 @@
 // PR c++/50870
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class V>
   struct impl
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype36.C b/gcc/testsuite/g++.dg/cpp0x/decltype36.C
index f3dfed992cfd..2cf34c0ecf21 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype36.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype36.C
@@ -1,5 +1,5 @@
 // PR c++/51265
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Funny
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype4.C b/gcc/testsuite/g++.dg/cpp0x/decltype4.C
index cd715cb28929..5db826fc5227 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype4.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype5.C b/gcc/testsuite/g++.dg/cpp0x/decltype5.C
index 1391539873f1..4c31a2b4a6a7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype5.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype6.C b/gcc/testsuite/g++.dg/cpp0x/decltype6.C
index 7aa8e1505efd..2f742ce08ccb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype6.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> 
 struct is_same 
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype9.C b/gcc/testsuite/g++.dg/cpp0x/decltype9.C
index 4cd150ea6cfb..c13ff8db5d6e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype9.C
@@ -1,6 +1,6 @@
 // PR c++/34271
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/deduce.C b/gcc/testsuite/g++.dg/cpp0x/deduce.C
index 635228cca08f..5185f9a3953e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/deduce.C
+++ b/gcc/testsuite/g++.dg/cpp0x/deduce.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 template<typename T, typename U> struct same_type;
 template<typename T> struct same_type<T, T> {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted1.C b/gcc/testsuite/g++.dg/cpp0x/defaulted1.C
index e8fe37eb39a4..1f36b185452d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted1.C
@@ -1,6 +1,6 @@
 // Positive test for defaulted/deleted fns
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted10.C b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C
index 64fa5f019309..fe3eae5b4172 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C
@@ -1,5 +1,5 @@
 // PR c++/40381
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted11.C b/gcc/testsuite/g++.dg/cpp0x/defaulted11.C
index b9bed7e0037b..65cd0e27f47c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted11.C
@@ -1,5 +1,5 @@
 // Core issue 901
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted13.C b/gcc/testsuite/g++.dg/cpp0x/defaulted13.C
index 5ddbcb38c1cc..ad15a0e853c8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted13.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T>
 struct NonCopyable {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted14.C b/gcc/testsuite/g++.dg/cpp0x/defaulted14.C
index e476d576cfae..73072e2057dc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted14.C
@@ -1,5 +1,5 @@
 // PR c++/39866
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A {
   A& operator=(const A&) = delete; // { dg-bogus "" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
index 6d182df21582..99400ac4f9cf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C
@@ -1,5 +1,5 @@
 // PR c++/38796
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert ((X), #X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted16.C b/gcc/testsuite/g++.dg/cpp0x/defaulted16.C
index 741b43de27d5..25b2d5ad673a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted16.C
@@ -1,7 +1,7 @@
 // Test that non-inline default causes the function to be defined even if
 // it isn't used.
 
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler "_ZN1AC1Ev" } }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted17.C b/gcc/testsuite/g++.dg/cpp0x/defaulted17.C
index 79e91a0eb61b..48529f5a3a72 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted17.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A			// { dg-error "const|operator=" }
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted18.C b/gcc/testsuite/g++.dg/cpp0x/defaulted18.C
index 559dfde48332..7dd17345d11c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted18.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void f(char i, int j) = delete;	// { dg-message "<deleted>" }
 void f(int i, ...);		// { dg-message "void f" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted19.C b/gcc/testsuite/g++.dg/cpp0x/defaulted19.C
index ea33df39838e..560363274c2e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted19.C
@@ -1,5 +1,5 @@
 // We allocate a cookie to help us run the destructor even if it's deleted.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted2.C b/gcc/testsuite/g++.dg/cpp0x/defaulted2.C
index 57f74e8e7147..8a8c87463305 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted2.C
@@ -1,5 +1,5 @@
 // Negative test for defaulted/deleted fns.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void f();			// { dg-error "previous" }
 void f() = delete;		// { dg-error "deleted" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted20.C b/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
index 9b8c697abadd..49919ef78136 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted20.C
@@ -1,5 +1,5 @@
 // PR c++/46497
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   A(A&&) = default;
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted21.C b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
index 51505dc460e9..09a211ff7d3b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
@@ -1,5 +1,5 @@
 // PR c++/46736
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct U {
   U();
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted22.C b/gcc/testsuite/g++.dg/cpp0x/defaulted22.C
index 61e9d3205215..86dbed90bf87 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted22.C
@@ -1,6 +1,6 @@
 // Test that a virtual defaulted constructor is still virtual.
 // { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int r = 1;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted23.C b/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
index 5b4438ddd020..319cb396f991 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
@@ -1,5 +1,5 @@
 // Test for checking of exception specifications on defaulted fns
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted24.C b/gcc/testsuite/g++.dg/cpp0x/defaulted24.C
index 307bf94ab850..7f9aed69f0ec 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted24.C
@@ -1,5 +1,5 @@
 // PR c++/48280
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S {
   template < typename > S (const S &) = default; // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted25.C b/gcc/testsuite/g++.dg/cpp0x/defaulted25.C
index 2a38fedb2487..26b0c9184ea6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted25.C
@@ -1,5 +1,5 @@
 // PR c++/48930
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-prune-output "note" }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted26.C b/gcc/testsuite/g++.dg/cpp0x/defaulted26.C
index 746fa9081802..b9be726b3a74 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted26.C
@@ -1,5 +1,5 @@
 // PR c++/49066
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 void foo() = delete;		// { dg-message "declared here" }
 void foo();
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted27.C b/gcc/testsuite/g++.dg/cpp0x/defaulted27.C
index 7d9139d23734..8f71e9eb254e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted27.C
@@ -1,5 +1,5 @@
 // PR c++/47544
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler "_ZN1sIiEC2Ev" } }
 // { dg-final { scan-assembler-not "_ZN1sIiED2Ev" } }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
index bcbf763f6dad..e8b44daeae32 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
@@ -1,6 +1,6 @@
 // PR c++/49102
 // PR c++/50034
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   A() = default;
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted29.C b/gcc/testsuite/g++.dg/cpp0x/defaulted29.C
index 5fcf5b0c5432..9e6382e37933 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted29.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted29.C
@@ -1,5 +1,5 @@
 // PR c++/46696
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted3.C b/gcc/testsuite/g++.dg/cpp0x/defaulted3.C
index bc5b14d2d591..21b137834268 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted3.C
@@ -1,5 +1,5 @@
 // PR c++/37006
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 struct A {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted30.C b/gcc/testsuite/g++.dg/cpp0x/defaulted30.C
index 0bf4425b875a..2440b94034fd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted30.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted30.C
@@ -1,5 +1,5 @@
 // PR c++/49507
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T>
 struct ConcretePoolKey
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted31.C b/gcc/testsuite/g++.dg/cpp0x/defaulted31.C
index c76a0f2bd69a..d866872157d5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted31.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted31.C
@@ -1,5 +1,5 @@
 // PR c++/39164
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted32.C b/gcc/testsuite/g++.dg/cpp0x/defaulted32.C
index 351cdae11023..a3654833617b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted32.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted32.C
@@ -1,5 +1,5 @@
 // PR c++/50531
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename T>
 class DataFilter
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted34.C b/gcc/testsuite/g++.dg/cpp0x/defaulted34.C
index 082199267399..463cc34e7fbf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted34.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted34.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler "__cxa_deleted_virtual" } }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted35.C b/gcc/testsuite/g++.dg/cpp0x/defaulted35.C
index ca700fb784c3..8312ba16aa9b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted35.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted35.C
@@ -1,5 +1,5 @@
 // PR c++/53096
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct foo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted4.C b/gcc/testsuite/g++.dg/cpp0x/defaulted4.C
index 56053840bdf8..3e5e92604edd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted4.C
@@ -1,6 +1,6 @@
 // PR c++/37208: SFINAE and deleted functions.
 
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do compile }
 template<int> struct A { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted5.C b/gcc/testsuite/g++.dg/cpp0x/defaulted5.C
index b7bd16b4063c..a8d7e9828cf9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted5.C
@@ -1,6 +1,6 @@
 // PR c++/37234
 // { dg-do link }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename T>
 class foo {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted6.C b/gcc/testsuite/g++.dg/cpp0x/defaulted6.C
index c33d57292237..05f06c946809 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted6.C
@@ -1,5 +1,5 @@
 // PR c++/37906
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct b
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted7.C b/gcc/testsuite/g++.dg/cpp0x/defaulted7.C
index 97c29258e988..00a24f03999b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted7.C
@@ -1,5 +1,5 @@
 // PR c++/38701, 38702
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void foo() = default;		// { dg-error "cannot be defaulted" }
 namespace
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted8.C b/gcc/testsuite/g++.dg/cpp0x/defaulted8.C
index f446f815691c..6ec936322d2b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted8.C
@@ -1,5 +1,5 @@
 // PR c++/38649
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted9.C b/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
index 1e5e2cbf9fbc..2907b03a1237 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted9.C
@@ -1,5 +1,5 @@
 // PR c++/39153
-// { dg-options "-std=c++0x -fno-inline" }
+// { dg-options "-std=c++11 -fno-inline" }
 
 struct _Impl_base
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/dependent1.C b/gcc/testsuite/g++.dg/cpp0x/dependent1.C
index 1ceeeafd78d9..de8a1a9380be 100644
--- a/gcc/testsuite/g++.dg/cpp0x/dependent1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/dependent1.C
@@ -1,5 +1,5 @@
 // PR c++/48319
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // We were failing to recognize declval<_Args1> as dependent.
 
 template<typename Tp> Tp declval() noexcept;
diff --git a/gcc/testsuite/g++.dg/cpp0x/diag1.C b/gcc/testsuite/g++.dg/cpp0x/diag1.C
index b3f30bcd0b45..0e53dcb69a36 100644
--- a/gcc/testsuite/g++.dg/cpp0x/diag1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/diag1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <int U>
 struct TypeA
diff --git a/gcc/testsuite/g++.dg/cpp0x/elision.C b/gcc/testsuite/g++.dg/cpp0x/elision.C
index 35d5e4b02fb4..70162a151bb9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/elision.C
+++ b/gcc/testsuite/g++.dg/cpp0x/elision.C
@@ -3,7 +3,7 @@
 // Test: Implicit cast to rvalue when eliding copy
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/elision2.C b/gcc/testsuite/g++.dg/cpp0x/elision2.C
index 216b1b59d16f..811c5394d7f0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/elision2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/elision2.C
@@ -1,5 +1,5 @@
 // Core 1148: should be able to move from value parameter on return
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/elision_neg.C b/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
index 78feac72a5be..f302605f73f4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
@@ -3,7 +3,7 @@
 // Test: Implicit cast to rvalue when eliding copy
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum1.C b/gcc/testsuite/g++.dg/cpp0x/enum1.C
index fb03692fab4a..41dd62240d47 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum1.C
@@ -1,6 +1,6 @@
 // PR c++/38021
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 enum : { };	// { dg-error "expected" }
 enum : 3 { };	// { dg-error "expected" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum10.C b/gcc/testsuite/g++.dg/cpp0x/enum10.C
index 55a1ab46be1c..825cc647d520 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum10.C
@@ -1,5 +1,5 @@
 // PR c++/48534
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class OpSE : bool;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum11.C b/gcc/testsuite/g++.dg/cpp0x/enum11.C
index 156c765beaf3..a2bd35352131 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum11.C
@@ -1,5 +1,5 @@
 // PR c++/48969
-// { dg-options "-std=c++0x -ftemplate-depth=10" }
+// { dg-options "-std=c++11 -ftemplate-depth=10" }
 
 template<unsigned int N> struct Pair { };
 struct Foo { enum { Mask = 1 }; } foo;
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum12.C b/gcc/testsuite/g++.dg/cpp0x/enum12.C
index b2ec91990e29..46d2686a6b30 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum12.C
@@ -1,5 +1,5 @@
 // PR c++/48780
-// { dg-options "-std=c++0x -fabi-version=0" }
+// { dg-options "-std=c++11 -fabi-version=0" }
 
 typedef __builtin_va_list __gnuc_va_list;
 typedef __gnuc_va_list va_list;
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum13.C b/gcc/testsuite/g++.dg/cpp0x/enum13.C
index ec02d3bf6076..3f637241fdcf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum13.C
@@ -1,5 +1,5 @@
 // PR c++/48780
-// { dg-options "-std=c++0x -fabi-version=5 -Wabi" }
+// { dg-options "-std=c++11 -fabi-version=5 -Wabi" }
 
 typedef __builtin_va_list __gnuc_va_list;
 typedef __gnuc_va_list va_list;
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum14.C b/gcc/testsuite/g++.dg/cpp0x/enum14.C
index 709b201d1f74..fe791f1a26b6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum14.C
@@ -1,5 +1,5 @@
 // PR c++/48106
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class E : char
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum15.C b/gcc/testsuite/g++.dg/cpp0x/enum15.C
index 1d33f90290f6..61737742adbb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum15.C
@@ -1,5 +1,5 @@
 // PR c++/44311
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class A { Val0, Val1 };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum16.C b/gcc/testsuite/g++.dg/cpp0x/enum16.C
index ebb48688b185..941d85b5c589 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum16.C
@@ -1,5 +1,5 @@
 // PR c++/48935
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class ENUM { a };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum17.C b/gcc/testsuite/g++.dg/cpp0x/enum17.C
index 8ba827e50f43..e67928ba4ca5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum17.C
@@ -1,5 +1,5 @@
 // PR c++/48536
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 #include <climits>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum18.C b/gcc/testsuite/g++.dg/cpp0x/enum18.C
index 306ed8259f97..c37eebe9de28 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum18.C
@@ -1,5 +1,5 @@
 // PR c++/47277
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int main(void) {
   enum e {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum19.C b/gcc/testsuite/g++.dg/cpp0x/enum19.C
index acdd86c0ba40..de423aa8cca7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum19.C
@@ -1,5 +1,5 @@
 // We shouldn't give an ABI warning about promotion in switch.
-// { dg-options "-std=c++0x -fabi-version=5 -Wabi" }
+// { dg-options "-std=c++11 -fabi-version=5 -Wabi" }
 
 enum class Foo { X };
 void test(Foo val)
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum2.C b/gcc/testsuite/g++.dg/cpp0x/enum2.C
index 21c265a923cf..57eccafe14c6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum2.C
@@ -1,5 +1,5 @@
 // PR c++/38637
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> enum E : int { e };	// { dg-error "declaration|expected" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum20.C b/gcc/testsuite/g++.dg/cpp0x/enum20.C
index e5dc186e4af4..0fcd9c907de8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum20.C
@@ -1,5 +1,5 @@
 // PR c++/47635
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum A { };
 void A::f() { }			// { dg-error "not a class" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum21b.C b/gcc/testsuite/g++.dg/cpp0x/enum21b.C
index 48989128d89c..aab0f5e215e5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum21b.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum21b.C
@@ -1,4 +1,4 @@
 // { dg-do compile }
-// { dg-options "-pedantic -std=c++0x" }
+// { dg-options "-pedantic -std=c++11" }
 
 enum x { y, };
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum3.C b/gcc/testsuite/g++.dg/cpp0x/enum3.C
index 5ae5e1a9d664..3e630d6e1e87 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum3.C
@@ -1,5 +1,5 @@
 // PR c++/38064
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 enum class E { elem };
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum4.C b/gcc/testsuite/g++.dg/cpp0x/enum4.C
index 002edf0923ec..adf24b9cecf2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum4.C
@@ -1,5 +1,5 @@
 // PR c++/40633
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< typename T >
 struct wrap {
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum5.C b/gcc/testsuite/g++.dg/cpp0x/enum5.C
index c4ceebed71ef..fd413228e698 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum5.C
@@ -1,5 +1,5 @@
 // PR c++/40639
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< typename T >
 struct wrap {
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum6.C b/gcc/testsuite/g++.dg/cpp0x/enum6.C
index e06398471255..74bd228a0bf9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum6.C
@@ -1,5 +1,5 @@
 // PR c++/37946
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 enum class E : char
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum7.C b/gcc/testsuite/g++.dg/cpp0x/enum7.C
index 407672a47996..ed6635d53bd6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum7.C
@@ -1,5 +1,5 @@
 // PR c++/37816
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum8.C b/gcc/testsuite/g++.dg/cpp0x/enum8.C
index 0075e2daa8bf..b0205a92497f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum8.C
@@ -1,6 +1,6 @@
 // PR c++/47704
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void
 foo ()
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum9.C b/gcc/testsuite/g++.dg/cpp0x/enum9.C
index 10e510bcd259..70a2103916eb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum9.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class E { };
 E f();
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum_base.C b/gcc/testsuite/g++.dg/cpp0x/enum_base.C
index 7da232cc2aa3..e63f4184237e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum_base.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum_base.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 typedef unsigned volatile long long uvlonglong;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum_base_warn.C b/gcc/testsuite/g++.dg/cpp0x/enum_base_warn.C
index 4b14cf65e093..5257a9e4d110 100644
--- a/gcc/testsuite/g++.dg/cpp0x/enum_base_warn.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum_base_warn.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-O2 -Wtype-limits -std=c++0x" }
+// { dg-options "-O2 -Wtype-limits -std=c++11" }
 extern void link_error (void);
 
 enum Alpha : unsigned char {
diff --git a/gcc/testsuite/g++.dg/cpp0x/error1.C b/gcc/testsuite/g++.dg/cpp0x/error1.C
index 15cd38f8807d..59abd1695030 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error1.C
@@ -1,6 +1,6 @@
 // PR c++/34395
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int... N> void foo (int... x[N])	// { dg-message "int \\\[N\\\]\\.\\.\\. x" }
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/error2.C b/gcc/testsuite/g++.dg/cpp0x/error2.C
index ca681eb2f798..d39e7f023f60 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error2.C
@@ -1,5 +1,5 @@
 // PR c++/38656
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> int foo();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/error3.C b/gcc/testsuite/g++.dg/cpp0x/error3.C
index e7da961950e8..deee9a242539 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error3.C
@@ -1,5 +1,5 @@
 // PR c++/47336
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename T>
 void g(T t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/error4.C b/gcc/testsuite/g++.dg/cpp0x/error4.C
index 064c2f2f6204..fa638a44d253 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error4.C
@@ -1,5 +1,5 @@
 // PR c++/49156
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T> T declval();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/error5.C b/gcc/testsuite/g++.dg/cpp0x/error5.C
index 193192642248..0baa5000694f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error5.C
@@ -1,5 +1,5 @@
 // PR c++/49181
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/error6.C b/gcc/testsuite/g++.dg/cpp0x/error6.C
index 3b457952d38a..e059e2261d2c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error6.C
@@ -1,5 +1,5 @@
 // PR c++/48284
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename C>
 auto g(C& c) -> decltype (c.f()) { return c.f(); } // { dg-message "decltype .c\\.f" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/error7.C b/gcc/testsuite/g++.dg/cpp0x/error7.C
index 0dfbf9f0406d..9c9f1c9b1c10 100644
--- a/gcc/testsuite/g++.dg/cpp0x/error7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/error7.C
@@ -1,5 +1,5 @@
 // Test for printing the type of T{} in error messages.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T, T t> struct A { };
 template <class T> A<T,T{}> f(T t); // { dg-message "T{}" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit1.C b/gcc/testsuite/g++.dg/cpp0x/explicit1.C
index fe164fc8cb1f..e3004c7314de 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit1.C
@@ -1,5 +1,5 @@
 // Test for explicit conversion ops from N2437.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class U; class V;
 class T
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit2.C b/gcc/testsuite/g++.dg/cpp0x/explicit2.C
index c2327c140d8e..9938f5497129 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit2.C
@@ -1,5 +1,5 @@
 // Test for explicit conversion ops in various conversion situations.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 typedef void (*pfn)();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit3.C b/gcc/testsuite/g++.dg/cpp0x/explicit3.C
index 78d6f590cab7..6933c8cfa015 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit3.C
@@ -1,5 +1,5 @@
 // Test for "contextually converted to bool"
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit4.C b/gcc/testsuite/g++.dg/cpp0x/explicit4.C
index 0f3bc623a53e..bbefb68cbe5e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit4.C
@@ -1,5 +1,5 @@
 // Negative explicit conv test.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A {
   A(const A&, int = 0);		// { dg-message "note" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit5.C b/gcc/testsuite/g++.dg/cpp0x/explicit5.C
index 88a47071db12..4573fc6296cb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit5.C
@@ -1,5 +1,5 @@
 // test for extension of DR 899 to handle template ctors
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 int r = 1;
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit6.C b/gcc/testsuite/g++.dg/cpp0x/explicit6.C
index 0d620be08034..741b9a29fc2e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit6.C
@@ -1,5 +1,5 @@
 // PR c++/47080
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   explicit operator int();	// { dg-message "qualification conversion" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/explicit7.C b/gcc/testsuite/g++.dg/cpp0x/explicit7.C
index 7a0b73e9ba09..ed3b494fce57 100644
--- a/gcc/testsuite/g++.dg/cpp0x/explicit7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/explicit7.C
@@ -3,7 +3,7 @@
 // can be converted to type T with a qualification conversion (4.4) are
 // also candidate functions.
 
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { };
 struct B: A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/extern_template-1.C b/gcc/testsuite/g++.dg/cpp0x/extern_template-1.C
index ec2cb784e19e..9cec57c1c661 100644
--- a/gcc/testsuite/g++.dg/cpp0x/extern_template-1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/extern_template-1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 
 template <typename> void f() {}
 extern template void f<int>();
diff --git a/gcc/testsuite/g++.dg/cpp0x/extern_template-2.C b/gcc/testsuite/g++.dg/cpp0x/extern_template-2.C
index 89a9ceb5a772..7ec1864ec8f2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/extern_template-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/extern_template-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 
 template <typename> class S {};
 extern template class S<int>;
diff --git a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg1.C b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg1.C
index 25192ad8672c..27cb0579d857 100644
--- a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg1.C
@@ -1,5 +1,5 @@
 // PR c++/37766
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int a = 1;
 template<int& b = a> void f() {
diff --git a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg2.C b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg2.C
index d94843c1fe56..c119e86afedb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg2.C
@@ -1,5 +1,5 @@
 // PR c++/46831
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct B { };
 struct D : B { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum1.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum1.C
index 2817ae59573a..a147538ded94 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // opaque enum declarations
 enum class E1;
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum10.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum10.C
index a57c0a9f4154..59c8045cdad8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum10.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //This error is diagnosed at instantiation time
 template<typename T> struct S1
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum2.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum2.C
index b6ad87148678..d11dc7465ffc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct S1
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum3.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum3.C
index 4a7e9f98d47c..682fd93c7724 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum3.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 namespace S1
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum4.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum4.C
index 0fcc3bde0f57..162b4bf332eb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum4.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T> struct S1
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum5.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum5.C
index a2edfa7635c5..a0e74863306f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum5.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 namespace one
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum6.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum6.C
index 51ef6e43ec72..a42d93c47b0e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum6.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 enum class E1 : int; // { dg-error "previous definition" }
 enum E1 : int;  // { dg-error "scoped/unscoped mismatch" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum7.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum7.C
index 62e445c707b3..34e9af077d25 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum7.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T> struct S1
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum8.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum8.C
index 69e73119e0c5..1d85162aa2db 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum8.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //This instatiation is ok
 template<typename T> struct S1
diff --git a/gcc/testsuite/g++.dg/cpp0x/forw_enum9.C b/gcc/testsuite/g++.dg/cpp0x/forw_enum9.C
index da8cde27b40a..ba7d3c767171 100644
--- a/gcc/testsuite/g++.dg/cpp0x/forw_enum9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/forw_enum9.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T> struct S1
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/friend1.C b/gcc/testsuite/g++.dg/cpp0x/friend1.C
index 2cf4c3c715ad..838d250b23ba 100644
--- a/gcc/testsuite/g++.dg/cpp0x/friend1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/friend1.C
@@ -1,5 +1,5 @@
 // From N1791
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class C;
 typedef C Ct;
diff --git a/gcc/testsuite/g++.dg/cpp0x/friend2.C b/gcc/testsuite/g++.dg/cpp0x/friend2.C
index 39276a05ac38..7dbc8946b23b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/friend2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/friend2.C
@@ -1,5 +1,5 @@
 // PR c++/47721
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 // template type parameter friend:
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit-copy.C b/gcc/testsuite/g++.dg/cpp0x/implicit-copy.C
index c3f6b85e2475..70454dbf9c34 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit-copy.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit-copy.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 struct S
 {
   S();
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
index 64084c14855d..7ab73bd22cf9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
@@ -1,8 +1,8 @@
 // PR c++/46807
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // In C++98/03, B::B(const B&) is trivial because A::A(const A&) is trivial,
 // even though doing overload resolution would mean calling the template
-// constructor.  In C++0x, we do overload resolution to determine triviality.
+// constructor.  In C++11, we do overload resolution to determine triviality.
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit1.C b/gcc/testsuite/g++.dg/cpp0x/implicit1.C
index e4e16e1ad351..777ed549249c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit1.C
@@ -1,5 +1,5 @@
 // Test for implicitly deleted destructors.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-prune-output "default definition would be ill-formed" }
 // { dg-prune-output "within this context" }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit10.C b/gcc/testsuite/g++.dg/cpp0x/implicit10.C
index 721a93dd57e1..fcc47616f76e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit10.C
@@ -1,5 +1,5 @@
 // PR c++/46103
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct MoveOnly {
   MoveOnly(const MoveOnly&) = delete;
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit11.C b/gcc/testsuite/g++.dg/cpp0x/implicit11.C
index c974e2b7761e..3b536e7ec062 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit11.C
@@ -1,6 +1,6 @@
 // Test that we consider base dtors in determining whether
 // a derived ctor is deleted even if the ctor is trivial.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit12.C b/gcc/testsuite/g++.dg/cpp0x/implicit12.C
index da806e006a6c..ab51a87005f9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit12.C
@@ -1,5 +1,5 @@
 // PR c++/50500
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // If a class declares move operations, the implicitly declared copy
 // operations are deleted.
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit2.C b/gcc/testsuite/g++.dg/cpp0x/implicit2.C
index f24a78838faf..ae516b7fe82d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit2.C
@@ -1,6 +1,6 @@
 // Test that the synthesized C copy constructor calls the A template
 // constructor and has the appropriate exception specification.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 int r = 1;
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit3.C b/gcc/testsuite/g++.dg/cpp0x/implicit3.C
index a43eca708c03..abef33a8e63b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit3.C
@@ -1,6 +1,6 @@
 // Basic runtime test for implicit move constructor
 // { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int m;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit4.C b/gcc/testsuite/g++.dg/cpp0x/implicit4.C
index 47fd56a5252e..16cd4b4a0f07 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit4.C
@@ -1,6 +1,6 @@
 // Test that a base with only a move constructor causes the implicit copy
 // constructor to be deleted.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A			// { dg-message "declares a move" }
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit5.C b/gcc/testsuite/g++.dg/cpp0x/implicit5.C
index d25294831e3b..89ab44a2c307 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit5.C
@@ -1,6 +1,6 @@
 // Test that the default B copy constructor calls the deleted A
 // copy constructor.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A			// { dg-message "declares a move" }
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit6.C b/gcc/testsuite/g++.dg/cpp0x/implicit6.C
index c7902969dce2..41781fb83d18 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit6.C
@@ -1,5 +1,5 @@
 // Circular implicit declarations were causing errors
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Ray;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit7.C b/gcc/testsuite/g++.dg/cpp0x/implicit7.C
index f29e5009fbd6..4d9d6a6076c3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit7.C
@@ -1,5 +1,5 @@
 // PR c++/44909
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // Declaring A<D<E>>'s copy ctor means choosing a ctor to initialize D<E>,
 // which means choosing a ctor for C<B<E>>, which meant considering
 // C(const B<E>&) which means choosing a ctor for B<E>, which means choosing
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit8.C b/gcc/testsuite/g++.dg/cpp0x/implicit8.C
index c949af21050f..ba7f1b62a8ef 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit8.C
@@ -1,6 +1,6 @@
 // The hack for PR c++/44909 breaks this testcase.  We need feedback
 // from the C++ committee to know how to proceed.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit9.C b/gcc/testsuite/g++.dg/cpp0x/implicit9.C
index 3a6dbc558d9b..dd5dd76e0f24 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit9.C
@@ -1,5 +1,5 @@
 // Test that private base dtor makes derived ctor deleted
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array2.C
index 19eec33acf7f..6eb5bf25e3d9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-array2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef int IA[2];
 typedef double DA[2];
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C
index 25113d770b06..e3008cc559c0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef int IRT[2];
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
index 0ffcb3bcbae6..13ac0b3fec42 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-deduce.C
@@ -2,7 +2,7 @@
 // supported by the working draft, but is necessary for perfect forwarding
 // of initializer-lists to things that can take a std::initializer_list.
 
-// { dg-options "-std=c++0x -fdeduce-init-list" }
+// { dg-options "-std=c++11 -fdeduce-init-list" }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime1.C
index e43ce5d62cd6..673a05fcb59e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime1.C
@@ -1,6 +1,6 @@
 // Test that we properly extend the lifetime of the initializer_list
 // array even if the initializer_list is a subobject.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime2.C
index 16ae1ac6e075..914b2c82d477 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-lifetime2.C
@@ -1,6 +1,6 @@
 // Test that we properly extend the lifetime of the initializer_list
 // array even if the initializer_list is a subobject.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C b/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C
index d17cda3f63a9..9999f2ebe865 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-opt.C
@@ -1,5 +1,5 @@
 // PR c++/41997
-// { dg-options "-std=c++0x -O2 -fdump-tree-optimized" }
+// { dg-options "-std=c++11 -O2 -fdump-tree-optimized" }
 // { dg-final { scan-tree-dump-not "_0" "optimized" } }
 // { dg-final { cleanup-tree-dump "optimized" } }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-postfix-open-square.C b/gcc/testsuite/g++.dg/cpp0x/initlist-postfix-open-square.C
index 38b17820db35..87c926ef6e25 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-postfix-open-square.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-postfix-open-square.C
@@ -1,5 +1,5 @@
 // PR c++/51738
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct Index
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-value.C b/gcc/testsuite/g++.dg/cpp0x/initlist-value.C
index 215bb90d4df0..bb40b786d301 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-value.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-value.C
@@ -1,5 +1,5 @@
 // Test for value-initialization via {}
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 void * operator new (__SIZE_TYPE__, void *p) { return p; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-value2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-value2.C
index 2b78241e9564..594d814e4059 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-value2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-value2.C
@@ -2,7 +2,7 @@
 // constructor but defaulted default constructor.  The FDIS got this
 // wrong; see c++std-core-19883.
 
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist1.C b/gcc/testsuite/g++.dg/cpp0x/initlist1.C
index ff45f7176f61..fab577130d70 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist1.C
@@ -1,6 +1,6 @@
 // Basic uses of initializer lists
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist10.C b/gcc/testsuite/g++.dg/cpp0x/initlist10.C
index bf955f513e33..0f78b2c5f663 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist10.C
@@ -1,5 +1,5 @@
 // PR c++/38380
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist11.C b/gcc/testsuite/g++.dg/cpp0x/initlist11.C
index 546a5335f1a2..1948d3ec5347 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist11.C
@@ -1,5 +1,5 @@
 // PR c++/38684
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist12.C b/gcc/testsuite/g++.dg/cpp0x/initlist12.C
index f344c780cc25..f18f48f32908 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist12.C
@@ -1,5 +1,5 @@
 // PR c++/38698
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-prune-output "note" }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist13.C b/gcc/testsuite/g++.dg/cpp0x/initlist13.C
index bc5ee2c3aecf..53c90590a294 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist13.C
@@ -1,6 +1,6 @@
 // PR c++/39056
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 #include <complex>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist14.C b/gcc/testsuite/g++.dg/cpp0x/initlist14.C
index bb67f3e54da9..1760c612a8d2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist14.C
@@ -1,6 +1,6 @@
 // Bug: We weren't doing the normal replacement of array with pointer
 // for deduction in the context of a call because of the initializer list.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist15.C b/gcc/testsuite/g++.dg/cpp0x/initlist15.C
index b75cc81729f5..55fc4a47936e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist15.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Just discard errors pointing at header files
 // { dg-prune-output "include" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist16.C b/gcc/testsuite/g++.dg/cpp0x/initlist16.C
index 86a003960517..b6d1b1a09a8d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist16.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 extern "C" void abort();
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist17.C b/gcc/testsuite/g++.dg/cpp0x/initlist17.C
index 6ea08d150039..4e78bad91d86 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist17.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 void f(int i);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist18.C b/gcc/testsuite/g++.dg/cpp0x/initlist18.C
index c9a9bcd94151..755c267d6cd8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist18.C
@@ -1,6 +1,6 @@
 // PR c++/40308, 40311
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< typename T >
 struct test {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist19.C b/gcc/testsuite/g++.dg/cpp0x/initlist19.C
index 9cb197c9be26..6edd069c94c2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist19.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Allow other errors, too
 // { dg-prune-output "error" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist2.C b/gcc/testsuite/g++.dg/cpp0x/initlist2.C
index 2fe4770560d4..c0133dd25235 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist2.C
@@ -2,7 +2,7 @@
 // user-defined conversions.
 
 // { dg-do link }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist20.C b/gcc/testsuite/g++.dg/cpp0x/initlist20.C
index fcdb73f190c6..ce2982b7f510 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist20.C
@@ -1,5 +1,5 @@
 // PR c++/40689
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist21.C b/gcc/testsuite/g++.dg/cpp0x/initlist21.C
index 16923f87d7df..bad9e003d8f8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist21.C
@@ -1,5 +1,5 @@
 // PR c++/40689
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist22.C b/gcc/testsuite/g++.dg/cpp0x/initlist22.C
index 0855b59d5d50..f913aebb9067 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist22.C
@@ -1,5 +1,5 @@
 // Core issue 934
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int i;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist23.C b/gcc/testsuite/g++.dg/cpp0x/initlist23.C
index 48a997fca205..bc37fe601a57 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist23.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist24.C b/gcc/testsuite/g++.dg/cpp0x/initlist24.C
index 33e97c7dfb4f..e4c99c4fc8ff 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist24.C
@@ -1,5 +1,5 @@
 // PR c++/39923
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist25.C b/gcc/testsuite/g++.dg/cpp0x/initlist25.C
index 8e5e0065cfc6..cf0bfdaeb13e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist25.C
@@ -1,5 +1,5 @@
 // PR c++/41754
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 #include <map>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist26.C b/gcc/testsuite/g++.dg/cpp0x/initlist26.C
index bb28bdbd9b3c..1b9dfcad6fdd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist26.C
@@ -1,6 +1,6 @@
 // PR c++/42059
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 void
 foo (int i)
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist27.C b/gcc/testsuite/g++.dg/cpp0x/initlist27.C
index f8536d3e7e7f..95f93ac43aab 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist27.C
@@ -1,5 +1,5 @@
 // PR c++/42061
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int& i = { j };	// { dg-error "invalid initialization|was not declared" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist28.C b/gcc/testsuite/g++.dg/cpp0x/initlist28.C
index d1df7cb00440..b4125a5b43d8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist28.C
@@ -1,5 +1,5 @@
 // PR c++/42060
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void foo()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist29.C b/gcc/testsuite/g++.dg/cpp0x/initlist29.C
index 1568678e0d02..dbedeb9d29ea 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist29.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist29.C
@@ -1,5 +1,5 @@
 // PR c++/42331
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class Mesh
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist3.C b/gcc/testsuite/g++.dg/cpp0x/initlist3.C
index 412deb51129a..063a08f56338 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist30.C b/gcc/testsuite/g++.dg/cpp0x/initlist30.C
index a5bdb2eda919..e2c21ab17a3a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist30.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist30.C
@@ -1,5 +1,5 @@
 // Testcase for variadic init list deduction.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist31.C b/gcc/testsuite/g++.dg/cpp0x/initlist31.C
index ffc985567edc..85594a6fcf1a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist31.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist31.C
@@ -1,5 +1,5 @@
 // PR c++/43028
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist32.C b/gcc/testsuite/g++.dg/cpp0x/initlist32.C
index 78bbb5ef9964..7db5e78fd6f2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist32.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist32.C
@@ -1,5 +1,5 @@
 // Test that we try normal init if no list ctor is viable.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist33.C b/gcc/testsuite/g++.dg/cpp0x/initlist33.C
index b1c0ba09b5eb..6376473922b5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist33.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist33.C
@@ -1,5 +1,5 @@
 // PR c++/44045
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct base
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist34.C b/gcc/testsuite/g++.dg/cpp0x/initlist34.C
index 92f5a3a4605f..20df3432b05c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist34.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist34.C
@@ -1,5 +1,5 @@
 // PR c++/44157
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist35.C b/gcc/testsuite/g++.dg/cpp0x/initlist35.C
index e5b7cb4bd520..4b8547504c13 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist35.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist35.C
@@ -1,5 +1,5 @@
 // PR c++/41510
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct B
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist36.C b/gcc/testsuite/g++.dg/cpp0x/initlist36.C
index a703b45907e3..2d412466aefe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist36.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist36.C
@@ -1,5 +1,5 @@
 // PR c++/44358
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist37.C b/gcc/testsuite/g++.dg/cpp0x/initlist37.C
index 20c6ab6311f7..8fed990eb050 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist37.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist37.C
@@ -1,5 +1,5 @@
 // DR 990
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist38.C b/gcc/testsuite/g++.dg/cpp0x/initlist38.C
index 32e20d591c7f..1a4b8e505498 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist38.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist38.C
@@ -1,5 +1,5 @@
 // DR 990
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist39.C b/gcc/testsuite/g++.dg/cpp0x/initlist39.C
index a6dd1ec43d1b..afd8315496a5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist39.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist39.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { int i; };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist4.C b/gcc/testsuite/g++.dg/cpp0x/initlist4.C
index d1ffab8546c0..8e5edb9abc4c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist4.C
@@ -1,5 +1,5 @@
 // Test for initializer-list 'explicit' rule
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist40.C b/gcc/testsuite/g++.dg/cpp0x/initlist40.C
index 8cf36be1ca1a..0592fa23f967 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist40.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist40.C
@@ -1,5 +1,5 @@
 // PR c++/54835, DR 1518
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist41.C b/gcc/testsuite/g++.dg/cpp0x/initlist41.C
index b5385480c896..f07cf1dd8325 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist41.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist41.C
@@ -1,5 +1,5 @@
 // PR c++/44703
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist42.C b/gcc/testsuite/g++.dg/cpp0x/initlist42.C
index e63959deb213..c1ab63dc2e02 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist42.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist42.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum Unscoped { };
 enum class Scoped { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist43.C b/gcc/testsuite/g++.dg/cpp0x/initlist43.C
index 72a09bdea499..6e524f4bf631 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist43.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist43.C
@@ -1,5 +1,5 @@
 // Test that using T{} at file scope doesn't create a static temporary.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler-not "local" } }
 
 struct A { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist44.C b/gcc/testsuite/g++.dg/cpp0x/initlist44.C
index fbe0ea3fefe0..1c6403336a91 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist44.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist44.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist45.C b/gcc/testsuite/g++.dg/cpp0x/initlist45.C
index 0e34bc189773..c4c1867bf67e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist45.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist45.C
@@ -1,5 +1,5 @@
 // PR c++/46289
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist46.C b/gcc/testsuite/g++.dg/cpp0x/initlist46.C
index 2b9f07dbdc9b..64bc314ffbd8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist46.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist46.C
@@ -1,5 +1,5 @@
 // PR c++/48281
-// { dg-options "-std=c++0x -O2" }
+// { dg-options "-std=c++11 -O2" }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist47.C b/gcc/testsuite/g++.dg/cpp0x/initlist47.C
index 06d683e038a7..91f7d5edd84d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist47.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist47.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { ~A() = delete; };	// { dg-message "declared" }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist48.C b/gcc/testsuite/g++.dg/cpp0x/initlist48.C
index 9eb451a8277c..b8a5cf2d9606 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist48.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist48.C
@@ -1,5 +1,5 @@
 // PR c++/48726
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <memory>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist49.C b/gcc/testsuite/g++.dg/cpp0x/initlist49.C
index 752c4331afb0..cfed15474239 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist49.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist49.C
@@ -1,5 +1,5 @@
 // Test for non-trivial list-initialization with array new.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist5.C b/gcc/testsuite/g++.dg/cpp0x/initlist5.C
index 51345c73fc17..ed8f00a7a732 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist5.C
@@ -1,5 +1,5 @@
 // Test for narrowing diagnostics
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist50.C b/gcc/testsuite/g++.dg/cpp0x/initlist50.C
index 5cb23e2db3e3..50b5d18efb33 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist50.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist50.C
@@ -1,5 +1,5 @@
 // PR c++/45418
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A1 { };
 struct A2 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist51.C b/gcc/testsuite/g++.dg/cpp0x/initlist51.C
index 9163dd3a867e..1a63570f6a96 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist51.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist51.C
@@ -1,5 +1,5 @@
 // PR c++/47184
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist52.C b/gcc/testsuite/g++.dg/cpp0x/initlist52.C
index 17c0cfe3f149..8a70513bca9e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist52.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist52.C
@@ -1,5 +1,5 @@
 // PR c++/45378
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist53.C b/gcc/testsuite/g++.dg/cpp0x/initlist53.C
index 22633f909559..8e5332704be0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist53.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist53.C
@@ -1,5 +1,5 @@
 // PR c++/49216
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist54.C b/gcc/testsuite/g++.dg/cpp0x/initlist54.C
index cdb296133f8d..d50c230dba6b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist54.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist54.C
@@ -1,5 +1,5 @@
 // PR c++/49355
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist55.C b/gcc/testsuite/g++.dg/cpp0x/initlist55.C
index cb42e81ed6a3..917bc935470a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist55.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist55.C
@@ -1,5 +1,5 @@
 // Test for -Wno-narrowing
-// { dg-options "-std=c++0x -pedantic-errors -Wno-narrowing" }
+// { dg-options "-std=c++11 -pedantic-errors -Wno-narrowing" }
 
 int i;
 float d = { i };
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist56.C b/gcc/testsuite/g++.dg/cpp0x/initlist56.C
index 862b41bb3c8c..72ad364ef27c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist56.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist56.C
@@ -1,5 +1,5 @@
 // PR c++/47453
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 // invalid
 int a({0});			// { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist57.C b/gcc/testsuite/g++.dg/cpp0x/initlist57.C
index d945a4689880..1a44b8124d00 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist57.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist57.C
@@ -1,5 +1,5 @@
 // PR c++/50054
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 void g( const int& (a)[1] ) {}	// { dg-error "array of references" }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist58.C b/gcc/testsuite/g++.dg/cpp0x/initlist58.C
index dfb9f0cd508d..a04e191b57d8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist58.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist58.C
@@ -1,5 +1,5 @@
 // PR c++/50209
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S { int i,j; };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist59.C b/gcc/testsuite/g++.dg/cpp0x/initlist59.C
index 2cc015d1fee3..3974042d26e9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist59.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist59.C
@@ -1,5 +1,5 @@
 // PR c++/49996
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist6.C b/gcc/testsuite/g++.dg/cpp0x/initlist6.C
index 523570315ebb..631bbd0407af 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist6.C
@@ -1,5 +1,5 @@
 // Test for initlist lifetime
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 #include <initializer_list>
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist62.C b/gcc/testsuite/g++.dg/cpp0x/initlist62.C
index cabbcd1db4e4..3a25e13f1efb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist62.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist62.C
@@ -1,5 +1,5 @@
 // PR c++/51399
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist64.C b/gcc/testsuite/g++.dg/cpp0x/initlist64.C
index bcf1658074d2..1550d477fb38 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist64.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist64.C
@@ -1,5 +1,5 @@
 // PR c++/51553
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist7.C b/gcc/testsuite/g++.dg/cpp0x/initlist7.C
index 55a0371860fd..73c924250bf5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist7.C
@@ -1,5 +1,5 @@
 // PR c++/37932
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 typedef enum { AA=1, BB=2 } my_enum;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist8.C b/gcc/testsuite/g++.dg/cpp0x/initlist8.C
index db63eee78b60..e2c85d70d207 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist8.C
@@ -1,5 +1,5 @@
 // PR c++/37740
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist9.C b/gcc/testsuite/g++.dg/cpp0x/initlist9.C
index 197fdd4ad04d..0ad39463bc0b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist9.C
@@ -1,5 +1,5 @@
 // PR c++/37860
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct b
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/inline-ns1.C b/gcc/testsuite/g++.dg/cpp0x/inline-ns1.C
index e422d8970f16..287b7e072aae 100644
--- a/gcc/testsuite/g++.dg/cpp0x/inline-ns1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/inline-ns1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler "_ZN1Q2V11fEv" } }
 // { dg-final { scan-assembler "_ZN1Q2V11iE" } }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/inline-ns2.C b/gcc/testsuite/g++.dg/cpp0x/inline-ns2.C
index 17a8bf601923..19fb9adfe905 100644
--- a/gcc/testsuite/g++.dg/cpp0x/inline-ns2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/inline-ns2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace Q {
   inline namespace V1 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/inline-ns3.C b/gcc/testsuite/g++.dg/cpp0x/inline-ns3.C
index 7c9d6b9b5469..4e8449e30ec6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/inline-ns3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/inline-ns3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace C
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/iop.C b/gcc/testsuite/g++.dg/cpp0x/iop.C
index 2eb3a3ce3375..34a5a5a1c2d2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/iop.C
+++ b/gcc/testsuite/g++.dg/cpp0x/iop.C
@@ -7,7 +7,7 @@
 //   section "Revision 1 Summary and Rationale" for more details.
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/linkage2.C b/gcc/testsuite/g++.dg/cpp0x/linkage2.C
index f41c21a77415..d9932948a20a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/linkage2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/linkage2.C
@@ -4,7 +4,7 @@
 //   o the variable or function is not used (3.2 [basic.def.odr]) or is
 //   defined in the same translation unit.
 
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename T> struct B {
   void g(T){}
diff --git a/gcc/testsuite/g++.dg/cpp0x/long_long.C b/gcc/testsuite/g++.dg/cpp0x/long_long.C
index 3ef710df4838..eb6a326bba30 100644
--- a/gcc/testsuite/g++.dg/cpp0x/long_long.C
+++ b/gcc/testsuite/g++.dg/cpp0x/long_long.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic" }
+// { dg-options "-std=c++11 -pedantic" }
 
 void foo()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/move1.C b/gcc/testsuite/g++.dg/cpp0x/move1.C
index 12e363a8cabe..f86618a70361 100644
--- a/gcc/testsuite/g++.dg/cpp0x/move1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/move1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -pedantic-errors" }
+// { dg-options "-std=c++11 -pedantic-errors" }
 
 #include <utility>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/named.C b/gcc/testsuite/g++.dg/cpp0x/named.C
index 2dff24ca4753..e97f4f6fd6ae 100644
--- a/gcc/testsuite/g++.dg/cpp0x/named.C
+++ b/gcc/testsuite/g++.dg/cpp0x/named.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 // { dg-do link }
 
 template<typename _Tp>
diff --git a/gcc/testsuite/g++.dg/cpp0x/named_refs.C b/gcc/testsuite/g++.dg/cpp0x/named_refs.C
index 0ccd42f4a0fe..f710f1e1f73c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/named_refs.C
+++ b/gcc/testsuite/g++.dg/cpp0x/named_refs.C
@@ -3,7 +3,7 @@
 // Test: Named rvalue references are treated as lvalues.
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept01.C b/gcc/testsuite/g++.dg/cpp0x/noexcept01.C
index b6be1ef7a3f3..4526cd301580 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept01.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept01.C
@@ -1,5 +1,5 @@
 // Test for noexcept-expression
-// { dg-options "-std=c++0x -O2" }
+// { dg-options "-std=c++11 -O2" }
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept02.C b/gcc/testsuite/g++.dg/cpp0x/noexcept02.C
index ffbb09192411..788317624918 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept02.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept02.C
@@ -1,5 +1,5 @@
 // Test for noexcept-specification
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #define SA(X) static_assert(X, #X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
index 41c442e90be6..b45cf365ce22 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C
@@ -1,5 +1,5 @@
 // Runtime test for noexcept-specification.
-// { dg-options "-std=c++0x -Wnoexcept" }
+// { dg-options "-std=c++11 -Wnoexcept" }
 // { dg-do run { target nonpic } }
 
 #include <exception>
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept04.C b/gcc/testsuite/g++.dg/cpp0x/noexcept04.C
index 8df818610f5f..6d31e5b4ca7f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept04.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept04.C
@@ -3,7 +3,7 @@
 // the compiler doesn't get clever about optimizing the calls based on
 // knowledge about the called functions.
 
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 #include <exception>
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept05.C b/gcc/testsuite/g++.dg/cpp0x/noexcept05.C
index 6acea4327365..8c74712b647f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept05.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept05.C
@@ -8,7 +8,7 @@
 // { dg-final { scan-assembler-not "EHB" } }
 // { dg-final { scan-assembler "LSDA" } }
 
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A { ~A(); };
 void g();
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept06.C b/gcc/testsuite/g++.dg/cpp0x/noexcept06.C
index 3babdffdad5d..5168dc640fc5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept06.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept06.C
@@ -1,6 +1,6 @@
 // Test that checking of a nothrow specification uses the one on the
 // definition.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 #include <exception>
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept07.C b/gcc/testsuite/g++.dg/cpp0x/noexcept07.C
index 0a5773fc86b3..f6df39f950e9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept07.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept07.C
@@ -1,6 +1,6 @@
 // Test that checking of a nothrow specification uses the one on the
 // definition.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 #include <exception>
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept08.C b/gcc/testsuite/g++.dg/cpp0x/noexcept08.C
index 1df85efff9c1..bceebb7ca19b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept08.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept08.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-prune-output "overriding" }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
index 2a4525cbd6c1..b50ef9975db6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C
@@ -1,5 +1,5 @@
 // Test that -Wnoexcept works with templates
-// { dg-options "-std=c++0x -Wnoexcept" }
+// { dg-options "-std=c++11 -Wnoexcept" }
 
 template <class T>
 T f (T t) { return t; }		// { dg-warning "does not throw" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept10.C b/gcc/testsuite/g++.dg/cpp0x/noexcept10.C
index 058a387d778e..1e86ac205ba0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept10.C
@@ -1,5 +1,5 @@
 // PR c++/49082
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std { template <class T> T&& declval() noexcept; }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept11.C b/gcc/testsuite/g++.dg/cpp0x/noexcept11.C
index b7c64a6ef06a..879a63ee5e28 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept11.C
@@ -1,5 +1,5 @@
 // PR c++/49107
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename _Tp>
 _Tp declval() noexcept;
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept12.C b/gcc/testsuite/g++.dg/cpp0x/noexcept12.C
index 1fd1b032f4cd..592504bd5e9b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept12.C
@@ -1,5 +1,5 @@
 // Test that we handle merging with deferred noexcept.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class U>
 struct O
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept13.C b/gcc/testsuite/g++.dg/cpp0x/noexcept13.C
index 7d51c82b5492..7e76200befe9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept13.C
@@ -1,5 +1,5 @@
 // PR c++/49107
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept14.C b/gcc/testsuite/g++.dg/cpp0x/noexcept14.C
index eba2c4080896..e6afca2b43a9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept14.C
@@ -1,4 +1,4 @@
 // PR c++/50309
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 void foo () noexcept () { } // { dg-error "expected" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept15.C b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C
index db5b5c7f3d70..efbd2ba90b6e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/noexcept15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C
@@ -1,5 +1,5 @@
 // PR c++/50391
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <type_traits>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nolinkage1.C b/gcc/testsuite/g++.dg/cpp0x/nolinkage1.C
index b69b6ddc4cf2..a7e6cd82c0d6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nolinkage1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nolinkage1.C
@@ -3,7 +3,7 @@
 
 // { dg-additional-sources "nolinkage1a.cc" }
 // { dg-do link }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include "nolinkage1.h"
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/not_special.C b/gcc/testsuite/g++.dg/cpp0x/not_special.C
index 2b510bb9a1bd..7b3c4ad1e3df 100644
--- a/gcc/testsuite/g++.dg/cpp0x/not_special.C
+++ b/gcc/testsuite/g++.dg/cpp0x/not_special.C
@@ -4,7 +4,7 @@
 //   That is, their presence should cause compiler declared
 //   copy ctor or assignment to be deleted.
 
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <assert.h>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-const1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-const1.C
index ddf9f04c580a..1051288a4d8c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-const1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-const1.C
@@ -1,5 +1,5 @@
 // PR c++/50707
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int g;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer1.C
index b3d9b9357502..4398739c8cda 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #define SA(X) static_assert(X,#X)
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer2.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer2.C
index 1951262f9dae..e4b963c94368 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C
index 2777fb5d8e63..3aae12c2a4cf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer3.C
@@ -1,5 +1,5 @@
 // Do NSDMI get deferred instantiation?
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
index 65b2e738077c..9d39f29df6e2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer5.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer5.C
index 85abfbf86181..ada5104615d8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer5.C
@@ -1,5 +1,5 @@
 // PR c++/51666 (DR 325)
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T, typename U>
 struct tuple
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-eh1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-eh1.C
index 09c92d2f158a..301eb61053ec 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-eh1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-eh1.C
@@ -1,6 +1,6 @@
 // Core issue 1351
 // { dg-do run { xfail *-*-* } }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 bool fail;
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-list1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-list1.C
index 526f29ae2850..68af73537558 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-list1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-list1.C
@@ -1,5 +1,5 @@
 // PR c++/50563
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S1 {
   int a{10}, b{20};     // OK
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-list2.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-list2.C
index a6321ffb6058..0d71417389f3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-list2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-list2.C
@@ -1,5 +1,5 @@
 // PR c++/50930
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct nmc {
  nmc() = default;
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C
index 04f1e0391d9d..aa77680f2e95 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template1.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct base
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template2.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template2.C
index 27b0aa5f9dad..952949c89508 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template2.C
@@ -1,5 +1,5 @@
 // PR c++/50614
-// { dg-options "-std=c++0x -fcompare-debug" }
+// { dg-options "-std=c++11 -fcompare-debug" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C
index 4aa8d482da88..edf54bb1d2d0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1.C
@@ -1,5 +1,5 @@
 // PR c++/51611
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi1.C
index 159c16de8517..a840700e88c9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi1.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi2.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi2.C
index 9636bed88208..5be3366f1dd7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi3.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi3.C
index 73b2bc2e1acb..3024e7315876 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi4.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi4.C
index db365cb55e51..08579eef1945 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi4.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 int c;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi5.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi5.C
index 62803b0819ef..9b33346422c1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nsdmi5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr01.C b/gcc/testsuite/g++.dg/cpp0x/nullptr01.C
index de3860c9ea41..27643e6b732f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr01.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr01.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test assignment to pointer
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr02.C b/gcc/testsuite/g++.dg/cpp0x/nullptr02.C
index 80977cb2f00e..7c330743b8c2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr02.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr02.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test assignment to nullptr_t
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr03.C b/gcc/testsuite/g++.dg/cpp0x/nullptr03.C
index b6df89637407..aaf199ce0db0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr03.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr03.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test assignment to int
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr04.C b/gcc/testsuite/g++.dg/cpp0x/nullptr04.C
index be581bcb6e37..999f05467c37 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr04.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr04.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test cast to int
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr05.C b/gcc/testsuite/g++.dg/cpp0x/nullptr05.C
index 22a8b51c1c7d..e6e6a1bb9d31 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr05.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr05.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test assignment to method pointer
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr06.C b/gcc/testsuite/g++.dg/cpp0x/nullptr06.C
index c50bb9bc1132..9b7b4dccfce9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr06.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr06.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test compare to pointer
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr07.C b/gcc/testsuite/g++.dg/cpp0x/nullptr07.C
index 64d442be3311..b2c27e811140 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr07.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr07.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test compare to int
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr08.C b/gcc/testsuite/g++.dg/cpp0x/nullptr08.C
index 1e5db278ddf8..d09e070eaa87 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr08.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr08.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test conversion to bool
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr09.C b/gcc/testsuite/g++.dg/cpp0x/nullptr09.C
index b35a3c3207d1..df6f5014a010 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr09.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr09.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test compare to literal 0
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr10.C b/gcc/testsuite/g++.dg/cpp0x/nullptr10.C
index fa32267ec028..4924dba9ce1a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr10.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test arithmetic operations
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr11.C b/gcc/testsuite/g++.dg/cpp0x/nullptr11.C
index 5907816a847d..91e8e71a3a86 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr11.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test relational operators
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr12.C b/gcc/testsuite/g++.dg/cpp0x/nullptr12.C
index 1713259f1036..0c1315182974 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr12.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test sizeof
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr13.C b/gcc/testsuite/g++.dg/cpp0x/nullptr13.C
index a9377584c56a..c51c81ef9628 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr13.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test typeid
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr14.C b/gcc/testsuite/g++.dg/cpp0x/nullptr14.C
index 4c4627b541b0..1e9e5173786d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr14.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test overload preference char*/int
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr15.C b/gcc/testsuite/g++.dg/cpp0x/nullptr15.C
index af661ecc3af5..1f91bae4fe57 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr15.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test template deduction
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr16.C b/gcc/testsuite/g++.dg/cpp0x/nullptr16.C
index 0ec0b6a12b6f..9456523037bb 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr16.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test template deduction
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr17.C b/gcc/testsuite/g++.dg/cpp0x/nullptr17.C
index 2e580557bc3a..728841495258 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr17.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test that bool is a better overload match than int
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr18.C b/gcc/testsuite/g++.dg/cpp0x/nullptr18.C
index b8fa38c718d3..656628828f45 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr18.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test overload of pointer versus bool when applied on a nullptr_t
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr19.C b/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
index ecc36139a404..92e7f9a88d27 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr19.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test overload of pointer versus nullptr_t when applied on a literal 0/__null
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr20.C b/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
index 3e58406770da..6c07eced7d11 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test passing to ellipisis
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr21.C b/gcc/testsuite/g++.dg/cpp0x/nullptr21.C
index 8362bd2965b7..0355b8260620 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr21.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test throw and catch
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr22.C b/gcc/testsuite/g++.dg/cpp0x/nullptr22.C
index d800f9869d2e..08c3b0ae0379 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr22.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x -Wall -Wformat=2 -Wstrict-null-sentinel" }
+// { dg-options "-std=c++11 -Wall -Wformat=2 -Wstrict-null-sentinel" }
 
 // Test various warnings
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr23.C b/gcc/testsuite/g++.dg/cpp0x/nullptr23.C
index a078269de201..077cd36806e7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr23.C
@@ -1,5 +1,5 @@
 // PR c++/50361
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr24.C b/gcc/testsuite/g++.dg/cpp0x/nullptr24.C
index f3917796627c..e7833d11ef47 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr24.C
@@ -1,5 +1,5 @@
 // PR c++/50371
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<decltype(nullptr)>
 struct nt;
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr25.C b/gcc/testsuite/g++.dg/cpp0x/nullptr25.C
index b8a7f45c674f..bdc2ed3ad5cf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr25.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<decltype(nullptr)>
 struct nt{};
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr26.C b/gcc/testsuite/g++.dg/cpp0x/nullptr26.C
index b7421b8d0488..457e3ae2d34b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr26.C
@@ -1,5 +1,5 @@
 // PR c++/51530
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T, class U>
 void f(T, U);
diff --git a/gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C b/gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C
index 778111283ff5..2661060b6e7c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/overload-conv-1.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 // { dg-do link }
 
 struct S {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C b/gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C
index 0e622bcacb25..a3fdd3a8fa44 100644
--- a/gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/overload-conv-2.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 // { dg-do link }
 
 struct T {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/overload.C b/gcc/testsuite/g++.dg/cpp0x/overload.C
index 3782d4a208ea..b10bb43fe115 100644
--- a/gcc/testsuite/g++.dg/cpp0x/overload.C
+++ b/gcc/testsuite/g++.dg/cpp0x/overload.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 // { dg-do link }
 // Generated by overload.py
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/overload2.C b/gcc/testsuite/g++.dg/cpp0x/overload2.C
index b335ea2be99b..e532fa25d545 100644
--- a/gcc/testsuite/g++.dg/cpp0x/overload2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/overload2.C
@@ -1,5 +1,5 @@
 // Core 1321
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // Two dependent names are equivalent even if the overload sets found by
 // phase 1 lookup are different.  Merging them keeps the earlier set.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/overloadn.C b/gcc/testsuite/g++.dg/cpp0x/overloadn.C
index a42707fe4f1b..00f9fde49002 100644
--- a/gcc/testsuite/g++.dg/cpp0x/overloadn.C
+++ b/gcc/testsuite/g++.dg/cpp0x/overloadn.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 // { dg-do link }
 // Generated by overload.py
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/override1.C b/gcc/testsuite/g++.dg/cpp0x/override1.C
index ba580b5c09fe..5b487106bfab 100644
--- a/gcc/testsuite/g++.dg/cpp0x/override1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/override1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 struct B
 {
   virtual void f() final {}
diff --git a/gcc/testsuite/g++.dg/cpp0x/override2.C b/gcc/testsuite/g++.dg/cpp0x/override2.C
index 1a7a36e1ae0c..e5a9aa6ac50d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/override2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/override2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 struct B1 {};
 
 struct B2 final {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/parse1.C b/gcc/testsuite/g++.dg/cpp0x/parse1.C
index 4fa7461cb22a..0a86caf4ac4f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/parse1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/parse1.C
@@ -1,5 +1,5 @@
 // PR c++/43509
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 typedef int B;			// { dg-message "" }
 B::B() {}			// { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31431-2.C b/gcc/testsuite/g++.dg/cpp0x/pr31431-2.C
index 076493938a8e..95901e56aa1b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31431-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31431-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename, typename..., typename> void foo(); // { dg-message "note" }
 
 void bar()
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31431.C b/gcc/testsuite/g++.dg/cpp0x/pr31431.C
index afd323715746..1e7507cd8b85 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31431.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31431.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename..., typename> void foo(); // { dg-message "note" }
 
 void bar()
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31432.C b/gcc/testsuite/g++.dg/cpp0x/pr31432.C
index 8016ee69d75b..f4de1973bd94 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31432.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31432.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename..., typename> struct A // { dg-error "parameter pack" }
 {
  static int i;
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31434.C b/gcc/testsuite/g++.dg/cpp0x/pr31434.C
index 54786167c35b..3bce5785eca1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31434.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31434.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... T> int foo(const T&) // { dg-error "not expanded with|T" }
 {
  union { T t; }; // { dg-error "not expanded with|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31437.C b/gcc/testsuite/g++.dg/cpp0x/pr31437.C
index 956a08b058d2..b7a7bbf28bf0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31437.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31437.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template <typename... T> struct A // { dg-message "candidates|A" }
 {
   A(T* p) {  // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31438.C b/gcc/testsuite/g++.dg/cpp0x/pr31438.C
index 74738830ad16..26c34b05ae37 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31438.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31438.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename> struct A;
 template<typename T, typename... U> struct A<T(U)> // { dg-error "parameter packs|U" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31439.C b/gcc/testsuite/g++.dg/cpp0x/pr31439.C
index c64bc3145b6d..13221959bd97 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31439.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31439.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<char> struct A<> {}; // { dg-error "not used in partial specialization|anonymous|declaration" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31442.C b/gcc/testsuite/g++.dg/cpp0x/pr31442.C
index f4e411c45059..bed4b57be978 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31442.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31442.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... T, T = 0> struct A {}; // { dg-error "parameter packs|T|the end|parameter packs|anonymous" }
 
 struct B
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31443.C b/gcc/testsuite/g++.dg/cpp0x/pr31443.C
index 1eb9d318de00..0decd7593675 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31443.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31443.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<int, typename... T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31444.C b/gcc/testsuite/g++.dg/cpp0x/pr31444.C
index b1f86fe7a7ed..316ddb62187c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31444.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31444.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... T> struct A
 {
   template<int> void foo(A<T>); // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31445.C b/gcc/testsuite/g++.dg/cpp0x/pr31445.C
index b3f2b5b09daf..283eafb5990d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31445.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31445.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template <typename... T> struct A
 {
   void foo(T...);
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31993.C b/gcc/testsuite/g++.dg/cpp0x/pr31993.C
index 94fb9ccdab99..39a73498fc8c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr31993.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr31993.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename...> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32114.C b/gcc/testsuite/g++.dg/cpp0x/pr32114.C
index e78dfdf1df9c..923187163b4a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32114.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32114.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename ...T> struct A
 {
   typedef typename T::X Y; // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32115.C b/gcc/testsuite/g++.dg/cpp0x/pr32115.C
index a721eed4eb72..4e5700cdf734 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32115.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32115.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename ...T, int = 0> struct A {}; // { dg-error "end of" }
 
 A<int> a; // { dg-error "mismatch|expected|invalid" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32125.C b/gcc/testsuite/g++.dg/cpp0x/pr32125.C
index 210a29c0829d..7b913605b8b5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32125.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32125.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<typename...T> struct A<T*> // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32126.C b/gcc/testsuite/g++.dg/cpp0x/pr32126.C
index c525cca684b1..c1cca94b8696 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32126.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32126.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<typename...T> struct A<T> // { dg-error "not expanded|T|" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32127.C b/gcc/testsuite/g++.dg/cpp0x/pr32127.C
index 8e4bc0050b20..ca197ec4b3fe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32127.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32127.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...T> struct A
 {
   static T i; // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32128.C b/gcc/testsuite/g++.dg/cpp0x/pr32128.C
index 5876dbec4850..595e20e0876e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32128.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32128.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<typename...T, typename...U> 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32252.C b/gcc/testsuite/g++.dg/cpp0x/pr32252.C
index 543dc8873908..f0f4b3ca6103 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32252.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32252.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 int x[5];
 
 template<int M, int N, int (&... p)[N]> struct A;
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32253.C b/gcc/testsuite/g++.dg/cpp0x/pr32253.C
index d8f7b03b92f3..df30b6a7842a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32253.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32253.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<void (*... fp)()> struct A
 {
   A() { fp(); } // { dg-error "not expanded|fp" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr32566.C b/gcc/testsuite/g++.dg/cpp0x/pr32566.C
index f6e7a5b548d8..5802078f7c99 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr32566.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr32566.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<int...> struct A;
 
 template<template<int> class... T> struct A<T...> {}; // { dg-error "mismatch|expected" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr33839.C b/gcc/testsuite/g++.dg/cpp0x/pr33839.C
index 0a6610ac9953..b4d3a6203392 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr33839.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr33839.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 template<int> struct A;
 
 void foo()
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr33930.C b/gcc/testsuite/g++.dg/cpp0x/pr33930.C
index d1e6fa56b1df..814fb6537b9d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr33930.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr33930.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 typedef const int* type;
 
 float& foo( const type& ggg );
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr33955.C b/gcc/testsuite/g++.dg/cpp0x/pr33955.C
index cde92dedf97c..191fe5c356d3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr33955.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr33955.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename T>
 struct uncvref
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr33996.C b/gcc/testsuite/g++.dg/cpp0x/pr33996.C
index 07590f06f955..47829c04bc19 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr33996.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr33996.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #define BUG
 struct type
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34054.C b/gcc/testsuite/g++.dg/cpp0x/pr34054.C
index cfc6c4bdc76b..19fcece6ca55 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34054.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34054.C
@@ -1,5 +1,5 @@
 // PR c++/34054
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename... T> T foo() {} // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34056.C b/gcc/testsuite/g++.dg/cpp0x/pr34056.C
index 0e5246b6ab60..f227ce1a405f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34056.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34056.C
@@ -1,6 +1,6 @@
 // PR c++/34056
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename... T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34057.C b/gcc/testsuite/g++.dg/cpp0x/pr34057.C
index 38da5ff50157..1c28c546b31e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34057.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34057.C
@@ -1,6 +1,6 @@
 // PR c++/34057
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename... T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34058.C b/gcc/testsuite/g++.dg/cpp0x/pr34058.C
index 0cf1faec73f0..74dabc5151fe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34058.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34058.C
@@ -1,6 +1,6 @@
 // PR c++/34058
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename...T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34060.C b/gcc/testsuite/g++.dg/cpp0x/pr34060.C
index 8e0d321b2ac8..6653eb68fc8e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34060.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34060.C
@@ -1,6 +1,6 @@
 // PR c++/34060
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <int> struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr34061.C b/gcc/testsuite/g++.dg/cpp0x/pr34061.C
index 7d6e71d0e74b..bb750f1d6cde 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr34061.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr34061.C
@@ -1,5 +1,5 @@
 // PR c++/34061
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<template<int> class ...T> struct A : T<0> {}; // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr38646.C b/gcc/testsuite/g++.dg/cpp0x/pr38646.C
index f15fc8c29bba..2177aab8f02b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr38646.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr38646.C
@@ -1,6 +1,6 @@
 /* PR c++/38646 */
 /* { dg-do compile } */
-/* { dg-options "-std=c++0x" } */
+/* { dg-options "-std=c++11" } */
 
 template<int...> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr38795.C b/gcc/testsuite/g++.dg/cpp0x/pr38795.C
index 54fb361d3d44..bf44357fdf7a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr38795.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr38795.C
@@ -1,6 +1,6 @@
 // PR c++/38795
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename... T> int foo(int i)
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr39639.C b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
index 0838a0ba25f3..873c51e35f0a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr39639.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
@@ -1,7 +1,7 @@
 // Contributed by Dodji Seketeli <dodji@redhat.com>
 // Origin: PR c++/39639
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-prune-output "template argument 1 is invalid" }
 
 template <class... Types>
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr42844-2.C b/gcc/testsuite/g++.dg/cpp0x/pr42844-2.C
index 4425aacf627a..c7a02c2c7382 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr42844-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr42844-2.C
@@ -1,6 +1,6 @@
 // PR c++/42844
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A // { dg-message "user-provided default constructor" }
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr45908.C b/gcc/testsuite/g++.dg/cpp0x/pr45908.C
index 45399b5395fb..b50b7b03ca09 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr45908.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr45908.C
@@ -2,7 +2,7 @@
 // Testcase by Jonathan Wakely <redi@gcc.gnu.org>
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct vector {
     struct iterator { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr47416.C b/gcc/testsuite/g++.dg/cpp0x/pr47416.C
index 55426c1f81d9..d7c5b13080a2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr47416.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr47416.C
@@ -1,6 +1,6 @@
 // PR c++/47416
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 namespace std
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr47476.C b/gcc/testsuite/g++.dg/cpp0x/pr47476.C
index 1f6f09cccc6d..dd386d17e8a3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr47476.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr47476.C
@@ -1,6 +1,6 @@
 // PR c++/47476
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int
 foo (int a, int b)
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr48522.C b/gcc/testsuite/g++.dg/cpp0x/pr48522.C
index 1543d8a281dc..4f1117b9e318 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr48522.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr48522.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename T>
 struct Handle
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr50491.C b/gcc/testsuite/g++.dg/cpp0x/pr50491.C
index 48e7a1f743be..c6177169a735 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr50491.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr50491.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct GrandParent {
   void *get();
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr50901.C b/gcc/testsuite/g++.dg/cpp0x/pr50901.C
index 439c15cc1cd7..091952f3e68f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr50901.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr50901.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T> int foo(int a)
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51150.C b/gcc/testsuite/g++.dg/cpp0x/pr51150.C
index 37eb166b43e3..8fe2b6f0f2bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51150.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51150.C
@@ -1,5 +1,5 @@
 // PR c++/51150
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct Clock {
   double Now();
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51216.C b/gcc/testsuite/g++.dg/cpp0x/pr51216.C
index 4bdd071475ec..0433c848f099 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51216.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51216.C
@@ -1,5 +1,5 @@
 // PR c++/51216
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void foo()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51225.C b/gcc/testsuite/g++.dg/cpp0x/pr51225.C
index 6fcf8611f9cb..a9f1cf0dc675 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51225.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51225.C
@@ -1,5 +1,5 @@
 // PR c++/51225
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int> struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51313.C b/gcc/testsuite/g++.dg/cpp0x/pr51313.C
index ff078e02d678..203329635640 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51313.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51313.C
@@ -1,5 +1,5 @@
 // PR c++/51313
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class ostream;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51547.C b/gcc/testsuite/g++.dg/cpp0x/pr51547.C
index 80215f6a3415..5fae55a5f9c2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51547.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51547.C
@@ -1,5 +1,5 @@
 // PR c++/51547
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <class T>
 struct vector
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51619.C b/gcc/testsuite/g++.dg/cpp0x/pr51619.C
index dd51679158d1..75a922091aa9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr51619.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51619.C
@@ -1,6 +1,6 @@
 // PR c++/51619
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct A { virtual ~A(); };
 struct B { A a[1][1]; } b;
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for1.C b/gcc/testsuite/g++.dg/cpp0x/range-for1.C
index 49e2ecd0bde6..b0e711581740 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for1.C
@@ -2,7 +2,7 @@
 // Test the loop with an array
 
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 extern "C" void abort();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for10.C b/gcc/testsuite/g++.dg/cpp0x/range-for10.C
index 662074890d9d..e93f76eb4e95 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for10.C
@@ -1,6 +1,6 @@
 // PR c++/47388
 // { dg-do compile }
-// { dg-options "-fno-for-scope -std=c++0x" }
+// { dg-options "-fno-for-scope -std=c++11" }
 
 template <int>
 void
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for11.C b/gcc/testsuite/g++.dg/cpp0x/range-for11.C
index d02519a2519b..84f855890aee 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for11.C
@@ -3,7 +3,7 @@
 // with begin/end as member functions
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct iterator
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for12.C b/gcc/testsuite/g++.dg/cpp0x/range-for12.C
index 9b405dc620a9..4b85366e6a7a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for12.C
@@ -2,7 +2,7 @@
 // and begin/end as member functions
 
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 /* Preliminary declarations */
 namespace pre
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for13.C b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
index 7ebf0c563e83..2b8d7f7105b3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
@@ -2,7 +2,7 @@
 // with member begin/end
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //These should not be used
 template<typename T> int *begin(T &t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for14.C b/gcc/testsuite/g++.dg/cpp0x/range-for14.C
index 438555e1344f..651ce37f1d8c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for14.C
@@ -2,7 +2,7 @@
 // begin/end member functions
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //These should not be used
 template<typename T> int *begin(T &t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for15.C b/gcc/testsuite/g++.dg/cpp0x/range-for15.C
index 38f330771ea2..bbdc1999b04a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for15.C
@@ -2,7 +2,7 @@
 // and begin/end as member (non-)virtual functions
 
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 unsigned int g;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for16.C b/gcc/testsuite/g++.dg/cpp0x/range-for16.C
index 86cc2a828bff..76c1b91649a3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for16.C
@@ -2,7 +2,7 @@
 // incomplete type or unknown size
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 extern int a[10];
 extern int b[];
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for17.C b/gcc/testsuite/g++.dg/cpp0x/range-for17.C
index eb888d9ab62a..72516f15e05d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for17.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern "C" int printf (const char *, ...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for18.C b/gcc/testsuite/g++.dg/cpp0x/range-for18.C
index 386d73d18179..f06311c7668a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for18.C
@@ -1,7 +1,7 @@
 // PR c++/48994
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename T>
 struct myvec
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for19.C b/gcc/testsuite/g++.dg/cpp0x/range-for19.C
index 4306fbda6ce1..ee208d77e1b2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for19.C
@@ -1,7 +1,7 @@
 // PR c++/49838
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for2.C b/gcc/testsuite/g++.dg/cpp0x/range-for2.C
index 17eb41dba7ba..325525ce4e37 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for2.C
@@ -3,7 +3,7 @@
 // with begin/end in an associated namespace
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct iterator
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for20.C b/gcc/testsuite/g++.dg/cpp0x/range-for20.C
index 890eb0aeaf90..3d979d26fd16 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for20.C
@@ -1,6 +1,6 @@
 // PR c++/49834
 // PR c++/50020
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for21.C b/gcc/testsuite/g++.dg/cpp0x/range-for21.C
index 07bb95fbf2b0..bf0b02bf398c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for21.C
@@ -1,5 +1,5 @@
 // PR c++/49983
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 void f(T t)
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for22.C b/gcc/testsuite/g++.dg/cpp0x/range-for22.C
index 5fef5e6accbb..9db46eeb8fdc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for22.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<int I> void f() {
   for (auto i: {I} );
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for3.C b/gcc/testsuite/g++.dg/cpp0x/range-for3.C
index 85115a38f5ee..c2204f91758f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for3.C
@@ -3,7 +3,7 @@
 // with begin/end in std
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct iterator
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for4.C b/gcc/testsuite/g++.dg/cpp0x/range-for4.C
index afbcf14b26e3..b27ec6ff4bf8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for4.C
@@ -1,7 +1,7 @@
 // Test for range-based for loop with templates
 
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 /* Preliminary declarations */
 namespace pre
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for5.C b/gcc/testsuite/g++.dg/cpp0x/range-for5.C
index 04754b780e68..e74e33a23733 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for5.C
@@ -1,7 +1,7 @@
 // Test for errors in range-based for loops
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct container
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for6.C b/gcc/testsuite/g++.dg/cpp0x/range-for6.C
index 775507f8de86..5fe405fac886 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for6.C
@@ -2,7 +2,7 @@
 // Test the loop with an initializer_list
 
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for7.C b/gcc/testsuite/g++.dg/cpp0x/range-for7.C
index ad89dc201b62..253d6b0c4339 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for7.C
@@ -1,7 +1,7 @@
 // PR c++/46056
 // Check that range-based for loop calls destructors 
 // when required
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 extern "C" void abort();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for8.C b/gcc/testsuite/g++.dg/cpp0x/range-for8.C
index 641dfe052c2d..7ef214edfaf3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for8.C
@@ -2,7 +2,7 @@
 // a new type
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/reference_collapsing.C b/gcc/testsuite/g++.dg/cpp0x/reference_collapsing.C
index 5b682e304598..669689dbba5e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/reference_collapsing.C
+++ b/gcc/testsuite/g++.dg/cpp0x/reference_collapsing.C
@@ -4,7 +4,7 @@
 //    for how cv-qualifications are applied to reference types. 7.1.3, 14.3.1
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-bitfield.C b/gcc/testsuite/g++.dg/cpp0x/rv-bitfield.C
index ed866f9e1f37..e4db7a277362 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-bitfield.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-bitfield.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-bitfield2.C b/gcc/testsuite/g++.dg/cpp0x/rv-bitfield2.C
index e054151b056b..1f0d12e48a6a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-bitfield2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-bitfield2.C
@@ -1,5 +1,5 @@
 // PR c++/51868
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
   A() {}
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-cast.C b/gcc/testsuite/g++.dg/cpp0x/rv-cast.C
index 48b7c13ba59a..d7bafc483cf3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-cast.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-cast.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 void f(int i)
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-cast2.C b/gcc/testsuite/g++.dg/cpp0x/rv-cast2.C
index 94ee4ca849e2..4d2ed52128d7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-cast2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-cast2.C
@@ -1,5 +1,5 @@
 // Test for const_cast to reference (5.2.11/4).
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> T&& xval();
 template <class T> T& lval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-conv1.C b/gcc/testsuite/g++.dg/cpp0x/rv-conv1.C
index 38529913f850..ba2b6bb4d6da 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-conv1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-conv1.C
@@ -1,5 +1,5 @@
 // PR c++/49267
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X {
   operator int&();
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-deduce.C b/gcc/testsuite/g++.dg/cpp0x/rv-deduce.C
index 043543631adc..7763c42b290a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-deduce.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-deduce.C
@@ -1,5 +1,5 @@
 // PR c++/36816, core issue 873
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> void h (T&&) { }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-deduce2.C b/gcc/testsuite/g++.dg/cpp0x/rv-deduce2.C
index 160296f640fa..26a8d551fb61 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-deduce2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-deduce2.C
@@ -1,5 +1,5 @@
 // PR c++/48313
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename F>
 void f(F&&) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C b/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C
index 65aac8da2a1b..104ecbdaccaa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-dotstar.C
@@ -1,5 +1,5 @@
 // PR c++/49389
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T> T&& val();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-func.C b/gcc/testsuite/g++.dg/cpp0x/rv-func.C
index db142961128a..3ac7118b49fd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-func.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-func.C
@@ -1,5 +1,5 @@
 // PR c++/48457, Core 1238
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-func2.C b/gcc/testsuite/g++.dg/cpp0x/rv-func2.C
index b792342dada3..51516bf53de2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-func2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-func2.C
@@ -1,5 +1,5 @@
 // PR c++/49458
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef void ftype();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-func3.C b/gcc/testsuite/g++.dg/cpp0x/rv-func3.C
index 8504682d7911..f33140174a49 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-func3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-func3.C
@@ -1,5 +1,5 @@
 // DR 1328
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> struct A {
   operator T&();  // #1
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-lvalue-req.C b/gcc/testsuite/g++.dg/cpp0x/rv-lvalue-req.C
index a8f424df003a..fd5aa65b3a62 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-lvalue-req.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-lvalue-req.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> T&& declval();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-reinterpret.C b/gcc/testsuite/g++.dg/cpp0x/rv-reinterpret.C
index 5b6e4c3d126a..02061fc3f282 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-reinterpret.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-reinterpret.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 void f(int &);
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-restrict.C b/gcc/testsuite/g++.dg/cpp0x/rv-restrict.C
index 569ee5bb6c95..23c7bbe22120 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-restrict.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-restrict.C
@@ -1,5 +1,5 @@
 // PR c++/45401
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef int &__restrict restrictLvref;
 typedef restrictLvref &&rvrefToRestrictLvref;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-return.C b/gcc/testsuite/g++.dg/cpp0x/rv-return.C
index 3ab659833eab..088f376cf1f7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-return.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-return.C
@@ -1,5 +1,5 @@
 // PR c++/41815
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T, typename U> struct same_type;
 template<typename T> struct same_type<T, T> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-template1.C b/gcc/testsuite/g++.dg/cpp0x/rv-template1.C
index 11f53bd1c0a5..d73108c23b99 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-template1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-template1.C
@@ -1,5 +1,5 @@
 // PR c++/44870
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 void foo(int&& data);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C b/gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C
index cbce7c4ddd76..217116a39029 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-trivial-bug.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/33235
 #include <cassert>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv10.C b/gcc/testsuite/g++.dg/cpp0x/rv10.C
index 5e78b1dbb690..3c6566bcd918 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv10.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv1n.C b/gcc/testsuite/g++.dg/cpp0x/rv1n.C
index b15bdfb4c933..9ee46dc12f5f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv1n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv1n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv1p.C b/gcc/testsuite/g++.dg/cpp0x/rv1p.C
index 99e39e6a4bcf..f2f4c0b03916 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv1p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv1p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv2n.C b/gcc/testsuite/g++.dg/cpp0x/rv2n.C
index f22e863230e1..c39d5c06e508 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv2n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv2n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv2p.C b/gcc/testsuite/g++.dg/cpp0x/rv2p.C
index fca45c7352a5..209f89392ad5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv2p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv2p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv3n.C b/gcc/testsuite/g++.dg/cpp0x/rv3n.C
index 14b810ae68d5..67cbde24d5e3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv3n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv3n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv3p.C b/gcc/testsuite/g++.dg/cpp0x/rv3p.C
index 804b2ffbdbe4..12db70ca2e73 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv3p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv3p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv4n.C b/gcc/testsuite/g++.dg/cpp0x/rv4n.C
index 076e9a0488e9..9ed324e46554 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv4n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv4n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv4p.C b/gcc/testsuite/g++.dg/cpp0x/rv4p.C
index b2744e3cd9e1..8ec257179195 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv4p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv4p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv5n.C b/gcc/testsuite/g++.dg/cpp0x/rv5n.C
index d9b8cd239883..667012f55b52 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv5n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv5n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv5p.C b/gcc/testsuite/g++.dg/cpp0x/rv5p.C
index 9bb5e2bbb892..171b6dcf7066 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv5p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv5p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv6n.C b/gcc/testsuite/g++.dg/cpp0x/rv6n.C
index fbc932de1eff..89ed1c0ac506 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv6n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv6n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv6p.C b/gcc/testsuite/g++.dg/cpp0x/rv6p.C
index b2a3bdedd1be..92a4f94336f6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv6p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv6p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv7n.C b/gcc/testsuite/g++.dg/cpp0x/rv7n.C
index 206cc79bb149..4d81e2a71c17 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv7n.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv7n.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv7p.C b/gcc/testsuite/g++.dg/cpp0x/rv7p.C
index 918dc14b98c7..551b9d9c7830 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv7p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv7p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv8p.C b/gcc/testsuite/g++.dg/cpp0x/rv8p.C
index f6784dffc221..650fd76ba823 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv8p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv8p.C
@@ -3,7 +3,7 @@
 // Test overload resolution among reference types
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-skip-if "packed attribute missing for struct one/three/five/seven" { "epiphany-*-*" } { "*" } { "" } }
 
 template <bool> struct sa;
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv9p.C b/gcc/testsuite/g++.dg/cpp0x/rv9p.C
index ec08a824865f..4714d7c936ed 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rv9p.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv9p.C
@@ -1,5 +1,5 @@
 // PR c++/36744
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do run }
 
 struct S
diff --git a/gcc/testsuite/g++.dg/cpp0x/rvo.C b/gcc/testsuite/g++.dg/cpp0x/rvo.C
index d4459af64d39..0ba8b1002933 100644
--- a/gcc/testsuite/g++.dg/cpp0x/rvo.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rvo.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // Contributed by Sylvain Pion
 static int rvalue_constructions = 0;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum.C
index 20391eb407b7..a1f99482940d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/scoped_enum.C
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 enum class Color1 {
   Red, 
   Green,
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum2.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum2.C
index e87b36a27322..bf9e6574dc73 100644
--- a/gcc/testsuite/g++.dg/cpp0x/scoped_enum2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum2.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 enum class E { e = 10 };
 enum E2 { e2 = 10 };
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum_examples.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum_examples.C
index 67c3fcbebb16..aea744d9a4da 100644
--- a/gcc/testsuite/g++.dg/cpp0x/scoped_enum_examples.C
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum_examples.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 enum class Col { red, yellow, green };
                                 
 int x = Col::red; // { dg-error "cannot convert" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae1.C b/gcc/testsuite/g++.dg/cpp0x/sfinae1.C
index 292d8ae04b00..855d96795cd3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template< typename T_VECTOR >
 void f(const T_VECTOR &a, decltype(a[0]) t = 0);
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae10.C b/gcc/testsuite/g++.dg/cpp0x/sfinae10.C
index ede8b7042454..c62aba77373a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae10.C
@@ -1,5 +1,5 @@
 // PR c++/48452
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 namespace std {
   template <class T> T&& declval();
 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae11.C b/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
index 2e8408d8f4da..e5d5255c11c8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
@@ -1,5 +1,5 @@
 // PR c++/48468
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-prune-output "note" }
 
 template<class T>
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae12.C b/gcc/testsuite/g++.dg/cpp0x/sfinae12.C
index 114f1b42da8c..927ac7a6d824 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae12.C
@@ -1,5 +1,5 @@
 // PR c++/48535
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T,
  class = decltype(T{})
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae13.C b/gcc/testsuite/g++.dg/cpp0x/sfinae13.C
index 465df2d8b8c1..511944b8e469 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae13.C
@@ -1,5 +1,5 @@
 // PR c++/48581
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae14.C b/gcc/testsuite/g++.dg/cpp0x/sfinae14.C
index 305f96eddcad..23ef8443fdb6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae14.C
@@ -1,5 +1,5 @@
 // PR c++/48557
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 struct add_rval_ref
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae15.C b/gcc/testsuite/g++.dg/cpp0x/sfinae15.C
index 595ca40b5552..e2830968bb06 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae15.C
@@ -1,5 +1,5 @@
 // PR c++/48531
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T,
   class = decltype(T())
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae16.C b/gcc/testsuite/g++.dg/cpp0x/sfinae16.C
index 6470567b7a2f..7bd1aabd8a34 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae16.C
@@ -1,5 +1,5 @@
 // PR c++/48531
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T,
   class = decltype(T())
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae17.C b/gcc/testsuite/g++.dg/cpp0x/sfinae17.C
index dbbd9efe4107..3b91621b11a4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae17.C
@@ -1,5 +1,5 @@
 // PR c++/48530
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T,
 	 class = decltype(T{})
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae18.C b/gcc/testsuite/g++.dg/cpp0x/sfinae18.C
index bb54335e6cc8..bf98f4024516 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae18.C
@@ -1,5 +1,5 @@
 // PR c++/48530
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T, 
   class = decltype(T())
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae19.C b/gcc/testsuite/g++.dg/cpp0x/sfinae19.C
index be96983bf399..59c6a71b2d14 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae19.C
@@ -1,5 +1,5 @@
 // PR c++/48737
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae2.C b/gcc/testsuite/g++.dg/cpp0x/sfinae2.C
index b9ef70d99cf5..1eec1a105254 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae2.C
@@ -1,5 +1,5 @@
 // PR c++/44967
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename T> T&& declval();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae20.C b/gcc/testsuite/g++.dg/cpp0x/sfinae20.C
index 486064c3af76..c0ba70ced977 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae20.C
@@ -1,5 +1,5 @@
 // PR c++/48744
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 struct add_rval_ref {
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae21.C b/gcc/testsuite/g++.dg/cpp0x/sfinae21.C
index 4fba6eb82a1d..3eab43cb0ac4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae21.C
@@ -1,5 +1,5 @@
 // PR c++/48735
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T, 
  class = decltype(T{})
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae22.C b/gcc/testsuite/g++.dg/cpp0x/sfinae22.C
index 1c3efd2e079c..8379d04ca3ea 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae22.C
@@ -1,5 +1,5 @@
 // PR c++/48745
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 struct add_rval_ref {
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae23.C b/gcc/testsuite/g++.dg/cpp0x/sfinae23.C
index 4e2ea88b171d..794b336aead1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae23.C
@@ -1,5 +1,5 @@
 // PR c++/48647
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template< class T >
 T&& declval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae24.C b/gcc/testsuite/g++.dg/cpp0x/sfinae24.C
index f974d82b1442..d6746e01e21e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae24.C
@@ -1,7 +1,7 @@
 // PR c++/49058
 // This error is not subject to SFINAE because it doesn't happen in the
 // deduction context.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-prune-output "note" }
 
 template<typename T> T val();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae25.C b/gcc/testsuite/g++.dg/cpp0x/sfinae25.C
index 7bdc8f88e51b..d8c46d0597ab 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae25.C
@@ -1,5 +1,5 @@
 // PR c++/49105
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T, class = decltype(T{})>
 char f(int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae26.C b/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
index 374f9976b2c9..3fc5b280da7a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
@@ -1,5 +1,5 @@
 // PR c++/49229
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern void* enabler;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae27.C b/gcc/testsuite/g++.dg/cpp0x/sfinae27.C
index 93327ba9cc5b..2fa2232ab39b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae27.C
@@ -1,5 +1,5 @@
 // PR c++/50157
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T val();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae28.C b/gcc/testsuite/g++.dg/cpp0x/sfinae28.C
index da64f413c71c..a06fc9f74071 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae28.C
@@ -1,5 +1,5 @@
 // PR c++/50324
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct complete { };
 struct incomplete;
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae29.C b/gcc/testsuite/g++.dg/cpp0x/sfinae29.C
index a2e10b41d3ec..49ab96993760 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae29.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae29.C
@@ -1,5 +1,5 @@
 // PR c++/51047
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T> T &&declval();
 template<class T> decltype(declval<T>().x) f(T *);
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae3.C b/gcc/testsuite/g++.dg/cpp0x/sfinae3.C
index 8582ba777c45..b25b38861370 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae3.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std { template <class T> T&& declval(); }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae31.C b/gcc/testsuite/g++.dg/cpp0x/sfinae31.C
index ea151fe6490b..066b1de022a9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae31.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae31.C
@@ -1,5 +1,5 @@
 // PR c++/51973
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T>
 void f(T t) { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae32.C b/gcc/testsuite/g++.dg/cpp0x/sfinae32.C
index db3bf5a21fc9..67237ffb4905 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae32.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae32.C
@@ -1,5 +1,5 @@
 // PR c++/51989
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename T>
 struct is_container
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae4.C b/gcc/testsuite/g++.dg/cpp0x/sfinae4.C
index b66483124989..a409bf8b8b7c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae4.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std { template <class T> T&& declval(); }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae5.C b/gcc/testsuite/g++.dg/cpp0x/sfinae5.C
index 8474fb314312..e3592d06b497 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae5.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae6.C b/gcc/testsuite/g++.dg/cpp0x/sfinae6.C
index 401d5362d849..1b8843301651 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae6.C
@@ -1,5 +1,5 @@
 // PR c++/48113
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T> T declval();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae7.C b/gcc/testsuite/g++.dg/cpp0x/sfinae7.C
index 0a95a9644c74..19ec2ad1961f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae7.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae8.C b/gcc/testsuite/g++.dg/cpp0x/sfinae8.C
index 7f3012f94df1..a5464dee03bf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae8.C
@@ -1,5 +1,5 @@
 // PR c++/48449
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T, class = decltype(T())>
 char f(int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae9.C b/gcc/testsuite/g++.dg/cpp0x/sfinae9.C
index 6f1de21d51d8..98ac52c12a22 100644
--- a/gcc/testsuite/g++.dg/cpp0x/sfinae9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae9.C
@@ -1,5 +1,5 @@
 // PR c++/48450
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std {
   template <class T> T&& declval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert1.C b/gcc/testsuite/g++.dg/cpp0x/static_assert1.C
index a54617598fb9..81a86615a55d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 void foo()
 {
   static_assert(1, "okay");
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert2.C b/gcc/testsuite/g++.dg/cpp0x/static_assert2.C
index 3e74bb1b480c..ac7dfdc92606 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<int I>
 struct accept_evens {
   static_assert( I % 2 == 0, "I must be an even number"); // { dg-error "even number" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert3.C b/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
index 0a4cbc98aff9..84d2e2a0b168 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 static_assert(7 / 0, "X"); // { dg-error "non-constant condition" "non-constant" }
 // { dg-warning "division by zero" "zero" { target *-*-* } 2 }
 // { dg-error "7 / 0.. is not a constant expression" "not a constant" { target *-*-* } 2 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert4.C b/gcc/testsuite/g++.dg/cpp0x/static_assert4.C
index b0818873f105..97c0bd659508 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x --param ggc-min-heapsize=0 --param ggc-min-expand=0 " }
+// { dg-options "-std=c++11 --param ggc-min-heapsize=0 --param ggc-min-expand=0 " }
 // PR C++/30033
 // Make sure that the static assert does not crash the GC.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert5.C b/gcc/testsuite/g++.dg/cpp0x/static_assert5.C
index b918796220cc..fdf26d12f07d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert5.C
@@ -1,5 +1,5 @@
 // PR c++/50837
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 struct z
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert6.C b/gcc/testsuite/g++.dg/cpp0x/static_assert6.C
index d1ab0dded9de..6fd9c27b85a7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert6.C
@@ -1,4 +1,4 @@
 // PR c++/51397
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 static_assert('X' != '\130', "'X' has the wrong value"); // { dg-error "'X' has the wrong value" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/std-layout1.C b/gcc/testsuite/g++.dg/cpp0x/std-layout1.C
index bdad8211145e..bff657c7396e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/std-layout1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/std-layout1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // [basic.types]/10:
 // Scalar types, standard-layout class types (Clause 9), arrays of such
diff --git a/gcc/testsuite/g++.dg/cpp0x/syntax-err1.C b/gcc/testsuite/g++.dg/cpp0x/syntax-err1.C
index ce1c9eea5344..818eaac0a14a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/syntax-err1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/syntax-err1.C
@@ -1,5 +1,5 @@
 // PR c++/47198
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp-constructor-bug.C b/gcc/testsuite/g++.dg/cpp0x/temp-constructor-bug.C
index a06720702050..b7bb9b85a258 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp-constructor-bug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp-constructor-bug.C
@@ -1,4 +1,4 @@
-// { dg-options "--std=c++0x" }
+// { dg-options "--std=c++11" }
 
 struct S { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp-va-arg-bug.C b/gcc/testsuite/g++.dg/cpp0x/temp-va-arg-bug.C
index 085915f907ed..97b33ac67d43 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp-va-arg-bug.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp-va-arg-bug.C
@@ -1,5 +1,5 @@
-// { dg-options "--std=c++0x" }
-// { dg-options "-Wno-abi --std=c++0x" { target arm_eabi } }
+// { dg-options "--std=c++11" }
+// { dg-options "-Wno-abi --std=c++11" { target arm_eabi } }
 #include <stdarg.h>
 
 struct S { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp_default1.C b/gcc/testsuite/g++.dg/cpp0x/temp_default1.C
index dfa2cfb7bc7f..bf2629214ed8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp_default1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp_default1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T, typename U>
 struct is_same
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp_default2.C b/gcc/testsuite/g++.dg/cpp0x/temp_default2.C
index dab1650e4480..0d1598ce9595 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp_default2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp_default2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <class T, class U = double> 
 void f(T t = 0, U u = 0); 	// { dg-message "note" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp_default3.C b/gcc/testsuite/g++.dg/cpp0x/temp_default3.C
index f71fe0f435ad..e72e75797fba 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp_default3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp_default3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T, typename U = typename T::value_type>
 void f(T);
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp_default4.C b/gcc/testsuite/g++.dg/cpp0x/temp_default4.C
index aa2ad58e01eb..6b2f5b189289 100644
--- a/gcc/testsuite/g++.dg/cpp0x/temp_default4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/temp_default4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 class X {
   template<typename T = int> friend void f(X) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/template_deduction.C b/gcc/testsuite/g++.dg/cpp0x/template_deduction.C
index 4b8bd12b489d..73aa3eec9dc1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/template_deduction.C
+++ b/gcc/testsuite/g++.dg/cpp0x/template_deduction.C
@@ -3,7 +3,7 @@
 // Test the "Augmented" template argument deduction when binding an lvalue to an rvalue reference.
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing1.C b/gcc/testsuite/g++.dg/cpp0x/trailing1.C
index f637857b427a..8b568a286ca4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing1.C
@@ -1,5 +1,5 @@
 // Tests for late-specified return type.
-// { dg-options "-std=c++0x -fabi-version=5" }
+// { dg-options "-std=c++11 -fabi-version=5" }
 
 auto f() -> int
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing3.C b/gcc/testsuite/g++.dg/cpp0x/trailing3.C
index 1c64f45731af..d95f298a1573 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing3.C
@@ -1,5 +1,5 @@
 // More auto/decltype mangling tests.
-// { dg-options "-std=c++0x -fabi-version=0" }
+// { dg-options "-std=c++11 -fabi-version=0" }
 
 template <class T>
 struct B
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing4.C b/gcc/testsuite/g++.dg/cpp0x/trailing4.C
index 8d4baa97e5d5..f508bc4e8905 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing4.C
@@ -1,5 +1,5 @@
 // PR c++/38597
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T, class U>
 auto f(T,U) -> decltype(T() + U())
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing5.C b/gcc/testsuite/g++.dg/cpp0x/trailing5.C
index b97d362be2fc..b4f2bf75ffb2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing5.C
@@ -1,5 +1,5 @@
 // PR c++/38798, DR 770
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {};
 auto foo() -> struct A {}
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing6.C b/gcc/testsuite/g++.dg/cpp0x/trailing6.C
index 3476e90e5805..86b8e4435c0a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing6.C
@@ -1,5 +1,5 @@
 // PR c++/49003
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A {
     auto a() const -> decltype(this) { return this; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing7.C b/gcc/testsuite/g++.dg/cpp0x/trailing7.C
index c4db10ec80d7..e322a3c5ad92 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trailing7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trailing7.C
@@ -1,5 +1,5 @@
 // PR c++/50365
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { int i; };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/trivial1.C b/gcc/testsuite/g++.dg/cpp0x/trivial1.C
index 109c8ccdbd4a..06ed25733f3b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/trivial1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/trivial1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // [basic.types]/10:
 // Scalar types, trivial class types (Clause 9), arrays of such types and
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-addr.C b/gcc/testsuite/g++.dg/cpp0x/udlit-addr.C
index 7d3286e007be..92f192450a5f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-addr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-addr.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <cstddef>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
index df7b7281c3d9..602d8293e35c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <cstddef>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-args.C b/gcc/testsuite/g++.dg/cpp0x/udlit-args.C
index ca2039c59d31..15aa6a3ad2cf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-args.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-args.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <cstddef>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-clink-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-clink-neg.C
index a80e7244afd2..675ef31d2416 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-clink-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-clink-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern "C" {
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-concat-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-concat-neg.C
index 61dc2ab02c6b..10ff69b7a2b6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-concat-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-concat-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-concat.C b/gcc/testsuite/g++.dg/cpp0x/udlit-concat.C
index 612bc1d1116c..870ddc3f5e2c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-concat.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-concat.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-constexpr.C b/gcc/testsuite/g++.dg/cpp0x/udlit-constexpr.C
index 40b0dfac5315..e62c34af0c1b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-constexpr.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-constexpr.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 constexpr unsigned long long
 operator"" _grow(unsigned long long n)
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-declare-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-declare-neg.C
index 9060abba4940..a7eeb4629ab7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-declare-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-declare-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //  Check that undeclared literal operator calls and literals give appropriate errors.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-embed-quote.C b/gcc/testsuite/g++.dg/cpp0x/udlit-embed-quote.C
index 48a2a1b171d0..2832312f3a42 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-embed-quote.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-embed-quote.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //  Make sure embedded quotes are not a problem for string and char literals.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-friend.C b/gcc/testsuite/g++.dg/cpp0x/udlit-friend.C
index b3f3ef8a604d..0319701edb50 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-friend.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-friend.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 long double
 operator"" _Hertz(long double);
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-general.C b/gcc/testsuite/g++.dg/cpp0x/udlit-general.C
index 9e448ac80501..b876a07cde4f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-general.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-general.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test simple operator declaration and definition.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-implicit-conv-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-implicit-conv-neg.C
index 998ad155bf77..851cd9b9c18c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-implicit-conv-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-implicit-conv-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <cstdint>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-inline.C b/gcc/testsuite/g++.dg/cpp0x/udlit-inline.C
index 75032c576799..063fd8345de6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-inline.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-inline.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //  Literal operators can be inline.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-linkage-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-linkage-neg.C
index c2ecede8d48d..f969bb5ebabc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-linkage-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-linkage-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 extern "C"_badlinkage {	// { dg-error "expected unqualified-id before" }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C b/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C
index 6de31b65ea71..c226c269a548 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C
@@ -1,5 +1,5 @@
 // PR c++/52521
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-final { scan-assembler "_Zli2_wPKc" } }
 
 int operator "" _w(const char*);
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-member-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-member-neg.C
index a6220c4c0fc5..e6ea5776213a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-member-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-member-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class Foo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-namespace.C b/gcc/testsuite/g++.dg/cpp0x/udlit-namespace.C
index e5d54e519009..a84ed0e3a4f2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-namespace.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-namespace.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test simple operator declaration and definition in namespaces.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-nofunc-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-nofunc-neg.C
index 6ad79b85b1d8..2de8f7789833 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-nofunc-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-nofunc-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test error on non-function declaration.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-nonempty-str-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-nonempty-str-neg.C
index 981865f15263..e8ad1232ef00 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-nonempty-str-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-nonempty-str-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test error on non-empty string after 'operator' keyword.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-nospace-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-nospace-neg.C
index f06bd8bdf02b..429a876efc13 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-nospace-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-nospace-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 float operator ""_abc(const char*);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-nosuffix-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-nosuffix-neg.C
index b90635cd0fc3..3c56f216a15d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-nosuffix-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-nosuffix-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 char32_t
 operator"" (char32_t C)	// { dg-error "expected suffix identifier" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-nounder-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-nounder-neg.C
index 2067bbe561f9..b238f132878d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-nounder-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-nounder-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test warning on declaration without leading underscore.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-operator-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-operator-neg.C
index 27fdedec766a..caaaa4951e22 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-operator-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-operator-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //  Can't have *both* literal operator template and raw literal operator.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-overflow-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-overflow-neg.C
index ed2de22e49d7..c90467b6dda1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-overflow-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-overflow-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x -Woverflow" }
+// { dg-options "-std=c++11 -Woverflow" }
 // PR c++/52654
 
 int
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-overflow.C b/gcc/testsuite/g++.dg/cpp0x/udlit-overflow.C
index 85c15721887d..569c10f279c5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-overflow.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-overflow.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // PR c++/52654
 
 int
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-preproc-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-preproc-neg.C
index 23633390cf0d..0638ceeb4fef 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-preproc-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-preproc-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 int
 operator"" _badpreproc(const char *str)
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-length.C b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-length.C
index 2d910624a7cb..d30e9eeeec11 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-length.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-length.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/50958
 
 typedef decltype(sizeof(0)) size_type;
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op-string-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op-string-neg.C
index 58ad0e609d02..36d364c908b9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op-string-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op-string-neg.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 //  Make sure handing a string to a raw literal generates a sensible error message.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op.C b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op.C
index a31ef9328d25..dea0734b5d31 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-op.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <cassert>
 #include <cstring>
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-str.C b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-str.C
index e94410fd0619..e07788975983 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-raw-str.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-raw-str.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-resolve.C b/gcc/testsuite/g++.dg/cpp0x/udlit-resolve.C
index a25516220c29..b4544ee0727d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-resolve.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-resolve.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 #include <cstdint>
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
index 994d58c1a0b6..65284073b1a6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 //  Test that the standard suffixes shadow any user-defined suffixes of the same name.
 long double
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C b/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C
index 86903e8355a4..d8be7b78cb0a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-string-length.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/50941
 
 typedef decltype(sizeof(0)) size_type;
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-suffix-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-suffix-neg.C
index 56eab01d7365..e3b7e96936bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-suffix-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-suffix-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-systemheader.C b/gcc/testsuite/g++.dg/cpp0x/udlit-systemheader.C
index 599c8652a147..33dfb9e5d06f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-systemheader.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-systemheader.C
@@ -1,3 +1,3 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include "udlit_system_header"
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-template.C b/gcc/testsuite/g++.dg/cpp0x/udlit-template.C
index 6a28f74a22b3..55dca2ff8159 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-template.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-template.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // Test user-defined literals.
 // Test template operator declaration and definition.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg-neg.C
index e8ccb6f545d5..f2efdd7a658c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<char...>
   int operator"" _xyz(unsigned long long);	// { dg-error "has invalid argument list" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg.C
index 6324823fabbb..fb21f281e105 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<char...>
   int operator"" _abc();
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms-neg.C
index 4dab4d2f6f09..729325473a16 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms-neg.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class Foo { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms.C b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms.C
index 77456737c70c..d83fee8723a6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 class Foo { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/union1.C b/gcc/testsuite/g++.dg/cpp0x/union1.C
index cb0f01719c9e..f83c89bdeec5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union1.C
@@ -1,5 +1,5 @@
-// Negative test for C++0x unrestricted unions
-// { dg-options -std=c++0x }
+// Negative test for C++11 unrestricted unions
+// { dg-options -std=c++11 }
 // { dg-prune-output "implicitly deleted because" }
 
 struct A
diff --git a/gcc/testsuite/g++.dg/cpp0x/union2.C b/gcc/testsuite/g++.dg/cpp0x/union2.C
index 4f193e281c8a..78d88b2b6d95 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union2.C
@@ -1,5 +1,5 @@
-// Positive test for C++0x unrestricted unions
-// { dg-options -std=c++0x }
+// Positive test for C++11 unrestricted unions
+// { dg-options -std=c++11 }
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/union3.C b/gcc/testsuite/g++.dg/cpp0x/union3.C
index f1e8ddb61093..a1212e1a93ca 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union3.C
@@ -1,5 +1,5 @@
-// Runtime test for C++0x unrestricted unions
-// { dg-options -std=c++0x }
+// Runtime test for C++11 unrestricted unions
+// { dg-options -std=c++11 }
 // { dg-do run }
 
 int c, d;
diff --git a/gcc/testsuite/g++.dg/cpp0x/union4.C b/gcc/testsuite/g++.dg/cpp0x/union4.C
index c82a81cdba85..fa3e97f92263 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union4.C
@@ -1,5 +1,5 @@
 // PR c++/48537
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct SFoo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/union5.C b/gcc/testsuite/g++.dg/cpp0x/union5.C
index 423b3482323f..51780619af0c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union5.C
@@ -1,5 +1,5 @@
 // PR c++/49803
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct X
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C b/gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C
index c59667645863..8afe7a7ff277 100644
--- a/gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C
+++ b/gcc/testsuite/g++.dg/cpp0x/unnamed_refs.C
@@ -3,7 +3,7 @@
 // Test: Unamed rvalue references are treated as lvalues.
 
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <bool> struct sa;
 template <> struct sa<true> {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-104.C b/gcc/testsuite/g++.dg/cpp0x/variadic-104.C
index c693b33f9a54..e7a032c19937 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-104.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-104.C
@@ -1,5 +1,5 @@
 // PR c++/45236
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T, class S> class foo;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-bind.C b/gcc/testsuite/g++.dg/cpp0x/variadic-bind.C
index abe445d4341e..21ebb2ff9f92 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-bind.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-bind.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // A basic implementation of TR1's bind using variadic teplates
 // Contributed by Douglas Gregor <doug.gregor@gmail.com>
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C
index f26aee2a91fb..768f2ee39771 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 #define ONE
 #define TWO
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C
index f46b8e534e48..f6b319664820 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-crash2.C
@@ -1,7 +1,7 @@
 // Contributed by Dodji Seketeli <dodji@redhat.com>
 // Origin: PR c++/39637
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<class... Types>
 void
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-default.C b/gcc/testsuite/g++.dg/cpp0x/variadic-default.C
index 2625e259f781..0653d2a2cf0f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-default.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-default.C
@@ -1,5 +1,5 @@
 // PR c++/49205
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 #include <initializer_list>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex1.C
index 485fffa476cf..0fd2ab969fbf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename ... Elements> class Tuple;
 Tuple<>* t; // OK: Elements is empty
 Tuple* u; // { dg-error "template-name" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
index e8b6b7221489..4515453294be 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Types> struct Tuple { };
 
 Tuple<> t0; // Types contains no arguments
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex11.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex11.C
index 57ef2a3d30e1..4d45d5e5a8e3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex11.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Types> 
   void f(Types... args);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex12.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex12.C
index b97df3102036..35a71a9c9ca7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex12.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Types> 
   void f(Types... rest);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex13.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex13.C
index b742cb1d3699..f024f8474c68 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex13.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename T, typename U> struct is_same {
   static const bool value = false;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
index 105096a78bf3..108d1111a698 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<class T> class A { /* ... */ };
 template<class T, class U = T> class B { /* ... */ };
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex2.C
index ca5fa2716372..0eb029bcb3fe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class... Types> struct B { // { dg-error "declaration of" }
   void f3();
   void f4();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex3.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex3.C
index 018eaa3ed8b8..25d80181d6de 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class X, class Y, class... Z> X f(Y); // { dg-message "note" }
 void g() 
 { 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex4.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex4.C
index 0a777c4853bf..b05ca57f3cf6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class X, class Y, class Z> X f(Y,Z); // { dg-message "note" }
 template<class... Args> void f2();
 void g() 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex5.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex5.C
index 2439a51c5a40..81b579710508 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex5.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Types> void f(Types... values);
 
 void g()
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex6.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex6.C
index 87b1bf205765..5bb01d5141dd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex6.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class...> struct Tuple { };
 
 template<class... Types> void f(Types&...);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex7.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex7.C
index 7ca31f9c67bb..69f94672b6b9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex7.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename...> struct Tuple { };
 template<typename... Types>              char& g(Tuple<Types...>);       // #1
 template<typename T1, typename... Types> short& g(Tuple<T1, Types...>);   // #2
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex8.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex8.C
index 03d28b825352..f7fb32ffe262 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex8.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class> struct X { static const bool primary = true; };
 template<class R, class... ArgTypes> struct X<R(int, ArgTypes...)> { 
   static const bool primary = false;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex9.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex9.C
index 74215c99727c..8b68711b8778 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex9.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>              char& f(Args... args);         // #1
 template<typename T1, typename... Args> short& f(T1 a1, Args... args); // #2
 template<typename T1, typename T2>      int& f(T1 a2, T2 a3);          // #3
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-explicit1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-explicit1.C
index a097f43d2183..8a1e285ecddc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-explicit1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-explicit1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T, class U> struct A { };
 template<class... T, class ... U> void f( A<T,U>... p);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-function.C b/gcc/testsuite/g++.dg/cpp0x/variadic-function.C
index eeb137705f28..4240b4f32847 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-function.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-function.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // A basic implementation of TR1's function using variadic teplates
 // Contributed by Douglas Gregor <doug.gregor@gmail.com>
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-init.C b/gcc/testsuite/g++.dg/cpp0x/variadic-init.C
index 34ade85e0f99..9972928d2cc8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-init.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-init.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 // PR c++/33510
 #define SIZE_FROM_CTOR
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-lambda.C b/gcc/testsuite/g++.dg/cpp0x/variadic-lambda.C
index 705d441493e0..51263fd57e6a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-lambda.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-lambda.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct int_placeholder;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn.C
index 51c5c79ef9f4..4e090d1e83f1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // { dg-do run }
 // A basic implementation of TR1's mem_fn using variadic teplates
 // Contributed by Douglas Gregor <doug.gregor@gmail.com>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-new.C b/gcc/testsuite/g++.dg/cpp0x/variadic-new.C
index 5bbb9c81b0e7..45d11bae286a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-new.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-new.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // Contributed by Peter Dimov
 // PR c++/32597
 #include <assert.h>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-new2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-new2.C
index 81d333398bdc..c47fbf438684 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-new2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-new2.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/32597
 #include <assert.h>
 #include <new>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-nondeduce1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-nondeduce1.C
index a64d7971c6ec..c6e44bb77aac 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-nondeduce1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-nondeduce1.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class... T>
 void f(T..., int, T...) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-rref.C b/gcc/testsuite/g++.dg/cpp0x/variadic-rref.C
index 08221b460fe8..609868475fa0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-rref.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-rref.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/33939
 template<typename T>
 struct refs_only;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-throw.C b/gcc/testsuite/g++.dg/cpp0x/variadic-throw.C
index 8363c2a73f98..4c3bd95bf333 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-throw.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-throw.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-prune-output "note" }
 // PR c++/33509
 template<int M, int N> struct pair
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ttp.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ttp.C
index 41f1c1db43d5..d8f14cb16aae 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ttp.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ttp.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // PR c++/34101
 template<typename> struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-tuple.C b/gcc/testsuite/g++.dg/cpp0x/variadic-tuple.C
index 11ce14af28cb..4ad2cc39a7bc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-tuple.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-tuple.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // An implementation of TR1's <tuple> using variadic teplates
 // Contributed by Douglas Gregor <doug.gregor@gmail.com>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-unify-2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-unify-2.C
index 80c9f5d2c3a1..33920a9a1a7f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-unify-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-unify-2.C
@@ -1,6 +1,6 @@
 // Contributed by Dodji Seketeli <dodji@redhat.com>
 // Origin: PR c++/40155
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-do compile }
 
 template <typename T> struct identity
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-unify.C b/gcc/testsuite/g++.dg/cpp0x/variadic-unify.C
index 54234391e64d..5213dbbabf3f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-unify.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-unify.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct tuple { };
 
 template<typename... Args1, typename... Args2>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-unresolved.C b/gcc/testsuite/g++.dg/cpp0x/variadic-unresolved.C
index a8463de19808..2fc3471dded2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-unresolved.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-unresolved.C
@@ -1,5 +1,5 @@
 // PR c++/50086
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename T> void tfun();
 template<typename T> void fun1(T);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic1.C b/gcc/testsuite/g++.dg/cpp0x/variadic1.C
index f87d53ca386d..884ef886239f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename...>
 class tuple;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic10.C b/gcc/testsuite/g++.dg/cpp0x/variadic10.C
index 5f73eba8d682..6a03df053a7e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic10.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T1, typename T2>
 struct pair {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic100.C b/gcc/testsuite/g++.dg/cpp0x/variadic100.C
index a364bbc91168..654c4e9013b9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic100.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic100.C
@@ -1,5 +1,5 @@
 // PR c++/43143
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename T>
 T&& declval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic101.C b/gcc/testsuite/g++.dg/cpp0x/variadic101.C
index 445a770afa15..d028a570eaa5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic101.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic101.C
@@ -1,5 +1,5 @@
 // PR c++/43382
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 struct Container
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic102.C b/gcc/testsuite/g++.dg/cpp0x/variadic102.C
index dc9c4aea8cb5..e656886fc3ee 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic102.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic102.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 struct nAny {
   template<class... T>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic103.C b/gcc/testsuite/g++.dg/cpp0x/variadic103.C
index 9d6b5ea20b85..cab73d7647db 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic103.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic103.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic105.C b/gcc/testsuite/g++.dg/cpp0x/variadic105.C
index 66d24a7efe32..ecd2410f4bb3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic105.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic105.C
@@ -1,5 +1,5 @@
 // PR c++/47289
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 // { dg-prune-output "note" }
 
 template <template <typename... __ARGS> class _F, typename... _ARGS>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic106.C b/gcc/testsuite/g++.dg/cpp0x/variadic106.C
index 80ec0844fbf4..d68b9ff011a7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic106.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic106.C
@@ -1,5 +1,5 @@
 // Origin: PR c++/47326
-// { dg-options  "-std=c++0x" }
+// { dg-options  "-std=c++11" }
 // { dg-do compile }
 
 template <int _N>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic107.C b/gcc/testsuite/g++.dg/cpp0x/variadic107.C
index 5c3f468515d3..0d6923f4fd1f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic107.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic107.C
@@ -1,5 +1,5 @@
 // PR c++/48451
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 namespace std {
   template <class T> T&& declval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic108.C b/gcc/testsuite/g++.dg/cpp0x/variadic108.C
index 3ad5af457175..0986516415c5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic108.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic108.C
@@ -1,5 +1,5 @@
 // PR c++/48736
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T&& create();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic109.C b/gcc/testsuite/g++.dg/cpp0x/variadic109.C
index 0ec69af812e5..8acdfb8c819d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic109.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic109.C
@@ -1,5 +1,5 @@
 // PR c++/48292
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename... Args> int g(Args...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic11.C b/gcc/testsuite/g++.dg/cpp0x/variadic11.C
index 3c27de0fb196..58eb1636f048 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic11.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic11.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename...> struct count;
 
 template<>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic110.C b/gcc/testsuite/g++.dg/cpp0x/variadic110.C
index 86f1bb1543c2..556594c3b741 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic110.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic110.C
@@ -1,5 +1,5 @@
 // PR c++/45698
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class... Ts> struct tuple { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic111.C b/gcc/testsuite/g++.dg/cpp0x/variadic111.C
index cb94ce697551..01a6653612fa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic111.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic111.C
@@ -1,5 +1,5 @@
 // PR c++/48424
-// { dg-options "-std=c++0x -fabi-version=0" }
+// { dg-options "-std=c++11 -fabi-version=0" }
 
 template<typename... Args1>
 struct S
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic112.C b/gcc/testsuite/g++.dg/cpp0x/variadic112.C
index 1640657d9508..be435542643c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic112.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic112.C
@@ -1,5 +1,5 @@
 // PR c++/49420
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct A { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic113.C b/gcc/testsuite/g++.dg/cpp0x/variadic113.C
index 3f1bb2ad04a7..bee367e947d9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic113.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic113.C
@@ -1,5 +1,5 @@
 // PR c++/49251
-// { dg-options "-std=c++0x -Wunused-parameter" }
+// { dg-options "-std=c++11 -Wunused-parameter" }
 
 struct A {};
 template <int> int f(A);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic114.C b/gcc/testsuite/g++.dg/cpp0x/variadic114.C
index 3ffede5c5079..80f546a82b40 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic114.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic114.C
@@ -1,5 +1,5 @@
 // PR c++/49785
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename, typename ...> struct B { };
 template <typename> class A;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic115.C b/gcc/testsuite/g++.dg/cpp0x/variadic115.C
index fa032e3b022b..8c59a79497da 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic115.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic115.C
@@ -1,5 +1,5 @@
 // PR c++/49593
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename... T> void f(T...) { }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic116.C b/gcc/testsuite/g++.dg/cpp0x/variadic116.C
index 079d751cb46f..ab4ed45f9b79 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic116.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic116.C
@@ -1,5 +1,5 @@
 // Origin: PR c++/48320
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class... T>
 struct tuple
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic117.C b/gcc/testsuite/g++.dg/cpp0x/variadic117.C
index 22f2fc5ae2dd..477a9f1e2753 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic117.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic117.C
@@ -1,4 +1,4 @@
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class T> struct A { typedef T type; };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic118.C b/gcc/testsuite/g++.dg/cpp0x/variadic118.C
index 43bf9bab2132..75ee1cdcabe9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic118.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic118.C
@@ -1,5 +1,5 @@
 // This should fail deduction, before it produces a candidate.
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <class... T>
 void f(T... ts);		// { dg-message "deduction" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic12.C b/gcc/testsuite/g++.dg/cpp0x/variadic12.C
index 30108c99932b..4b56b0117e8f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic12.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic12.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // A tuple type
 template<typename... Args> struct tuple { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic121.C b/gcc/testsuite/g++.dg/cpp0x/variadic121.C
index 805c0065fe92..1d086fc8ccd5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic121.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic121.C
@@ -1,5 +1,5 @@
 // PR c++/51507
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename ...>
 struct foo { typedef void type; };
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic13.C b/gcc/testsuite/g++.dg/cpp0x/variadic13.C
index 7794e8a3dc9d..24601e03ab2c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic13.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args> struct tuple1 { };
 template<typename... Args> struct tuple2 { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic135.C b/gcc/testsuite/g++.dg/cpp0x/variadic135.C
index fbf5dec4797e..841f7ceebbe2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic135.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic135.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template <typename ...> struct S;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic14.C b/gcc/testsuite/g++.dg/cpp0x/variadic14.C
index 3c1bb0d6d235..339d5f921d44 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic14.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename R, typename... ArgTypes>
 struct make_function_type
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic143.C b/gcc/testsuite/g++.dg/cpp0x/variadic143.C
index 7737b4cacf41..da3e7c4789e7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic143.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic143.C
@@ -1,5 +1,5 @@
 // PR c++/56782
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<class T>
 T&& declval();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic15.C b/gcc/testsuite/g++.dg/cpp0x/variadic15.C
index 68786cb82291..c7dadc6276dd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic15.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic15.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename R, typename... ArgTypes>
 struct make_function_type
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic16.C b/gcc/testsuite/g++.dg/cpp0x/variadic16.C
index 001919d469f1..23a5710760bd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic16.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic16.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename R, typename... ArgTypes>
 struct make_function_type
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic17.C b/gcc/testsuite/g++.dg/cpp0x/variadic17.C
index 986721bbec35..cc1a5f02125d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic17.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic17.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename R, typename... ArgTypes>
 struct make_function_type
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic18.C b/gcc/testsuite/g++.dg/cpp0x/variadic18.C
index 147ed8e4bfc5..cfacd7a7910a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic18.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename...> class tuple { };
 
 template<typename T, template<typename T> class... Metafunctions>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic19.C b/gcc/testsuite/g++.dg/cpp0x/variadic19.C
index 92e7a953aba7..7a0864504c72 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic19.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic19.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 struct tuple {
   static const int value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic2.C b/gcc/testsuite/g++.dg/cpp0x/variadic2.C
index 207a80648f3b..023cb08316d3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args = int> // { dg-error "default argument" }
 class tuple2;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic20.C b/gcc/testsuite/g++.dg/cpp0x/variadic20.C
index bfb42bea09ce..e8bdf121bf48 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic20.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T> struct add_pointer;
 template<typename T> struct add_reference;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic21.C b/gcc/testsuite/g++.dg/cpp0x/variadic21.C
index b65e995b9a14..e2115f1362c8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic21.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, int... Dims>
 struct array { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic22.C b/gcc/testsuite/g++.dg/cpp0x/variadic22.C
index 1d26e40d9815..c37f056c2bb5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic22.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename R, typename... ArgTypes>
 struct make_function_type
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic23.C b/gcc/testsuite/g++.dg/cpp0x/variadic23.C
index 43309a1e1f8e..ea0d31c50079 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic23.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, int... Dims>
 struct array { 
   static const int value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic24.C b/gcc/testsuite/g++.dg/cpp0x/variadic24.C
index 6ef8e8a77d09..fe953bc150e5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic24.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic24.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, T... Values>
 struct vector_c { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic25.C b/gcc/testsuite/g++.dg/cpp0x/variadic25.C
index 6589e7f60af6..a5f1eee70546 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic25.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic25.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<int... Values>
 struct sum;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic26.C b/gcc/testsuite/g++.dg/cpp0x/variadic26.C
index 7f9f6bc80520..9150e429958e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic26.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic26.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<template<int, int> class Meta, int Initial, int... Values>
 struct accumulate {
   static const int value = Initial;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic27.C b/gcc/testsuite/g++.dg/cpp0x/variadic27.C
index 45a897ce2c91..f4b4470a39c7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic27.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename Signature>
 struct function_traits;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic28.C b/gcc/testsuite/g++.dg/cpp0x/variadic28.C
index 167088b49455..4e60d9f2815d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic28.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename Signature>
 struct function_traits;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic29.C b/gcc/testsuite/g++.dg/cpp0x/variadic29.C
index aaed595831d7..a7bc877c73c0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic29.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic29.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename Signature>
 struct function_traits;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic3.C b/gcc/testsuite/g++.dg/cpp0x/variadic3.C
index 42ba8ab47eaf..f08ff62b8fb5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic3.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 class tuple {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic30.C b/gcc/testsuite/g++.dg/cpp0x/variadic30.C
index 66cbe9f6272e..36d93c12f3e6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic30.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic30.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... T>
 void eat(T...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic31.C b/gcc/testsuite/g++.dg/cpp0x/variadic31.C
index db8daa89858f..48ae5604c926 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic31.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic31.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x -g" }
+// { dg-options "-std=gnu++11 -g" }
 template<typename... T>
 void eat(T...) { }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic32.C b/gcc/testsuite/g++.dg/cpp0x/variadic32.C
index c5bee55ccb71..0f620ecbd134 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic32.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic32.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... T>
 void eat(const T&...) { }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic33.C b/gcc/testsuite/g++.dg/cpp0x/variadic33.C
index 5784be887ace..d962f5a1da99 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic33.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic33.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 void print_all() {}
 
 template<typename T, typename... Rest>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic34.C b/gcc/testsuite/g++.dg/cpp0x/variadic34.C
index 5eee3f13c62a..e266b603e82d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic34.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic34.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<int I, typename... Args>
 void get_ith(const Args&... args);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic35.C b/gcc/testsuite/g++.dg/cpp0x/variadic35.C
index 666a1f5d039c..518edec4145e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic35.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic35.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<int I, typename... Args>
 void get_ith(const Args&... args); // { dg-message "note" }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic36.C b/gcc/testsuite/g++.dg/cpp0x/variadic36.C
index 90636020401d..bbd2159b65f8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic36.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic36.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, typename... Args>
 void f(const T&, const Args&... args)
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic37.C b/gcc/testsuite/g++.dg/cpp0x/variadic37.C
index a6e5f613fcd8..2f6042ec27ca 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic37.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic37.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Values>
 struct tuple
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic38.C b/gcc/testsuite/g++.dg/cpp0x/variadic38.C
index e4ae4a6305d6..b320a8a3c5c8 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic38.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic38.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<int... Values>
 struct int_vec {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic39.C b/gcc/testsuite/g++.dg/cpp0x/variadic39.C
index bd656ba85049..4ee195527110 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic39.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic39.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 struct tuple {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic4.C b/gcc/testsuite/g++.dg/cpp0x/variadic4.C
index 1bdad3256fb1..5371a860bfa6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic4.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x -fabi-version=0" }
+// { dg-options "-std=gnu++11 -fabi-version=0" }
 // { dg-do compile }
 template<typename... Args>
 class tuple {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic40.C b/gcc/testsuite/g++.dg/cpp0x/variadic40.C
index 6cc9273a8971..c6512e901925 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic40.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic40.C
@@ -1,3 +1,3 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Values, typename T>
 struct backward_tuple {}; // { dg-error "end" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic41.C b/gcc/testsuite/g++.dg/cpp0x/variadic41.C
index 9cfd847f3186..3eee1f572c3b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic41.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic41.C
@@ -1,5 +1,5 @@
 // A function parameter pack is only deduced if it's at the end
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 void f(const Args&... args, int oops);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic42.C b/gcc/testsuite/g++.dg/cpp0x/variadic42.C
index 3ec68e8b1ff0..b5d917f186ac 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic42.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic42.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x -fabi-version=5" }
+// { dg-options "-std=gnu++11 -fabi-version=5" }
 // { dg-do compile }
 template<typename... Args>
 void f(Args...) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic43.C b/gcc/testsuite/g++.dg/cpp0x/variadic43.C
index fce81ae0dd1a..7310660752c1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic43.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic43.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 int f(const Args&...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic44.C b/gcc/testsuite/g++.dg/cpp0x/variadic44.C
index 8452a96cc21a..1e314be8b191 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic44.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic44.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 // { dg-do compile }
 template<typename... Args>
 int f(const Args&...);
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic45.C b/gcc/testsuite/g++.dg/cpp0x/variadic45.C
index c5a66ab2062b..a36a56b74913 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic45.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic45.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 int& f(Args...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic46.C b/gcc/testsuite/g++.dg/cpp0x/variadic46.C
index 8b81a363bf1f..1fe0e60e0ea9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic46.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic46.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 int& f(Args&...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic47.C b/gcc/testsuite/g++.dg/cpp0x/variadic47.C
index d80371c0eeea..252a4e7b1a5a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic47.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic47.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T> struct wrap { };
 
 template<typename... Args>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic48.C b/gcc/testsuite/g++.dg/cpp0x/variadic48.C
index ab3f777f7957..ca562c22e6fa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic48.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic48.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, typename... Args>
 int& f(const T&, Args...);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic49.C b/gcc/testsuite/g++.dg/cpp0x/variadic49.C
index 7e2215f2c23a..4ccedb1cd12d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic49.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic49.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 int& f(...);
 
 template<typename... Args>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic5.C b/gcc/testsuite/g++.dg/cpp0x/variadic5.C
index d1f333566d88..b2a351061955 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic5.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 struct tuple {
   static const int value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic50.C b/gcc/testsuite/g++.dg/cpp0x/variadic50.C
index a2c3b7c908f7..32fbb65f42d0 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic50.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic50.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 int& f(int, double, ...);
 
 template<typename... Args>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic51.C b/gcc/testsuite/g++.dg/cpp0x/variadic51.C
index e2e2d630a7b2..9b2fa218dd69 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic51.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic51.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T1, typename T2>
 float& f(T1, T2);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic52.C b/gcc/testsuite/g++.dg/cpp0x/variadic52.C
index 12b121fe4ec9..9293d86878a3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic52.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic52.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, T... Values>
 struct vector_c { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic53.C b/gcc/testsuite/g++.dg/cpp0x/variadic53.C
index 09a3879b4205..b595df5db565 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic53.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic53.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename F, typename... BoundArgs>
 class bound_functor
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic54.C b/gcc/testsuite/g++.dg/cpp0x/variadic54.C
index db750d765116..dd3ab109da8e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic54.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic54.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename F, typename... BoundArgs>
 class bound_functor
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic55.C b/gcc/testsuite/g++.dg/cpp0x/variadic55.C
index b9c8cffb0271..e22a16bb8a1b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic55.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic55.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename F, typename... BoundArgs>
 class bound_functor
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic56.C b/gcc/testsuite/g++.dg/cpp0x/variadic56.C
index 77846e513210..f0c1beb78944 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic56.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic56.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Elements>
 struct tuple { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic57.C b/gcc/testsuite/g++.dg/cpp0x/variadic57.C
index 9833b1bb359f..ca12a2d1a3e6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic57.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic57.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T, int... Dims>
 struct array { 
   int foo();
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic58.C b/gcc/testsuite/g++.dg/cpp0x/variadic58.C
index 5da0730b5aaf..3099ef6808fa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic58.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic58.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 #include <typeinfo>
 
 template<typename... Args>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic59.C b/gcc/testsuite/g++.dg/cpp0x/variadic59.C
index 6d6e52f93192..e7abf8b78a8e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic59.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic59.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<class T, typename... VarArgs>
 void print(T t, VarArgs args); // { dg-error "packs not expanded" }
 // { dg-message "VarArgs" "note" { target *-*-* } 3 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic6.C b/gcc/testsuite/g++.dg/cpp0x/variadic6.C
index 105550bb9031..bf6350e1dd55 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic6.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic6.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename ... Args>
 struct tuple_base {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic63.C b/gcc/testsuite/g++.dg/cpp0x/variadic63.C
index 359def1cd10e..83db8fc43b4d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic63.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic63.C
@@ -1,2 +1,2 @@
-// { dg-options "-std=gnu++0x -pedantic" }
+// { dg-options "-std=gnu++11 -pedantic" }
 template<typename... Args> class tuple;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic64.C b/gcc/testsuite/g++.dg/cpp0x/variadic64.C
index c9212e2e9599..fdc535406137 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic64.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic64.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<int... Indexes>
   struct _Index_tuple { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic65.C b/gcc/testsuite/g++.dg/cpp0x/variadic65.C
index 77be10676aef..4544f9289ca4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic65.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic65.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 struct unused;
 template<typename T1 = unused, typename T2 = unused, typename T3 = unused,
          typename T4 = unused, typename T5 = unused, typename T6 = unused>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic66.C b/gcc/testsuite/g++.dg/cpp0x/variadic66.C
index 5c31ae06fd4f..943bd70d0aa9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic66.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic66.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename Result, typename Functor, typename... ArgTypes>
 Result bind(Functor, ArgTypes...) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic67.C b/gcc/testsuite/g++.dg/cpp0x/variadic67.C
index e496bfc176c9..5538bc911e26 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic67.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic67.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Elements> struct tuple {};
 
 template<typename... Args>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic68.C b/gcc/testsuite/g++.dg/cpp0x/variadic68.C
index 07cf8e3896ad..22b3444a0ecf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic68.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic68.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 extern "C" void abort();
 
 template<typename T, T... Values>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic69.C b/gcc/testsuite/g++.dg/cpp0x/variadic69.C
index 5fe9a1950ff4..eb8626524be1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic69.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic69.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T>
 struct stored_value
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic7.C b/gcc/testsuite/g++.dg/cpp0x/variadic7.C
index 3ba37bfb66ee..68358f067177 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic7.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 struct tuple_base {
   static const int value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic70.C b/gcc/testsuite/g++.dg/cpp0x/variadic70.C
index 15bed461dc76..cc269915f423 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic70.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic70.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template <typename T, T... Args> struct bomb;
 
 template <typename T>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic71.C b/gcc/testsuite/g++.dg/cpp0x/variadic71.C
index bea3cc346319..879321593bcd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic71.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic71.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename...> struct list {};
 
 template<typename Sequence, typename Head>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic72.C b/gcc/testsuite/g++.dg/cpp0x/variadic72.C
index b1a620d53861..77520b301c2e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic72.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic72.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 struct A {};
 struct B {};
 struct C {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic73.C b/gcc/testsuite/g++.dg/cpp0x/variadic73.C
index 05925e7aa577..00e8fb46330c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic73.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic73.C
@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 struct A {};
 struct B {};
 struct C {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic75.C b/gcc/testsuite/g++.dg/cpp0x/variadic75.C
index f57f8b3ef475..32df43fd1167 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic75.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic75.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename...> struct tuple { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic76.C b/gcc/testsuite/g++.dg/cpp0x/variadic76.C
index ff0211ded150..df147fdcb7a9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic76.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic76.C
@@ -1,6 +1,6 @@
 // PR c++/33496
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<int... N> int foo ()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic77.C b/gcc/testsuite/g++.dg/cpp0x/variadic77.C
index 8c6119ff160a..49b5684b3e3c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic77.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic77.C
@@ -1,6 +1,6 @@
 // PR c++/33496
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<int M, int N> struct pair
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic78.C b/gcc/testsuite/g++.dg/cpp0x/variadic78.C
index 9e2b84ad0a6e..4d3d5428c0a4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic78.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic78.C
@@ -1,6 +1,6 @@
 // PR c++/33496
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<int M, int N> struct pair
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic79.C b/gcc/testsuite/g++.dg/cpp0x/variadic79.C
index c6479e04fe50..e7a2a15c0494 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic79.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic79.C
@@ -1,6 +1,6 @@
 // PR c++/33213
 // { dg-do compile }
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<template<typename> class...> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic8.C b/gcc/testsuite/g++.dg/cpp0x/variadic8.C
index c3a1340cf264..96fbfad7e790 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic8.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic8.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename... Args>
 struct tuple_base {
   static const int value = 0;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic80.C b/gcc/testsuite/g++.dg/cpp0x/variadic80.C
index a56cdb404c0e..a8bb9023a687 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic80.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic80.C
@@ -1,6 +1,6 @@
 // PR c++/31434
 // { dg-do run }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 extern "C" void abort ();
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic81.C b/gcc/testsuite/g++.dg/cpp0x/variadic81.C
index cce61b316490..e282394145c1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic81.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic81.C
@@ -1,5 +1,5 @@
 // PR c++/33461
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic82.C b/gcc/testsuite/g++.dg/cpp0x/variadic82.C
index 03aec80211d5..50be75db5570 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic82.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic82.C
@@ -1,5 +1,5 @@
 // PR c++/33461
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic83.C b/gcc/testsuite/g++.dg/cpp0x/variadic83.C
index c446e6974203..3293d813a899 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic83.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic83.C
@@ -1,5 +1,5 @@
 // PR c++/31441
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 
 template<typename> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic84.C b/gcc/testsuite/g++.dg/cpp0x/variadic84.C
index ce31267954f5..8e0dc4475fed 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic84.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic84.C
@@ -1,6 +1,6 @@
 // PR c++/32565
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename...> struct A1;
 template<template<int...> class T> struct A1<T<0> > {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic85.C b/gcc/testsuite/g++.dg/cpp0x/variadic85.C
index facb263910f0..6f6cb8a17bf3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic85.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic85.C
@@ -1,6 +1,6 @@
 // PR c++/32565
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename...> struct A1;
 template<template<int, int...> class T> struct A1<T<0, 1> > {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic86.C b/gcc/testsuite/g++.dg/cpp0x/variadic86.C
index d8fcd620e95f..73400548a96c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic86.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic86.C
@@ -1,6 +1,6 @@
 // PR c++/33943
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename... A> struct foo {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic87.C b/gcc/testsuite/g++.dg/cpp0x/variadic87.C
index 1defa23da292..7e82f37a6635 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic87.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic87.C
@@ -1,5 +1,5 @@
 // PR c++/33965
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 template<typename T>
 struct foo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic88.C b/gcc/testsuite/g++.dg/cpp0x/variadic88.C
index b14cabe32181..a917b5302123 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic88.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic88.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<template<typename...> class TT>
 TT<int, float, double> foo(TT<int, float>)
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic89.C b/gcc/testsuite/g++.dg/cpp0x/variadic89.C
index b943771a6dee..b5bedeba7e69 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic89.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic89.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // Contributed by Eric Niebler
 template<typename T, typename U>
 struct pair
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic9.C b/gcc/testsuite/g++.dg/cpp0x/variadic9.C
index c5db6af6a895..2d12de5fdf17 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic9.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++0x" }
+// { dg-options "-std=gnu++11" }
 template<typename T1, typename T2>
 struct pair {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic90.C b/gcc/testsuite/g++.dg/cpp0x/variadic90.C
index 632e166c3465..0529057e623d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic90.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic90.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<template<typename...> class TT>
 struct X { };
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic91.C b/gcc/testsuite/g++.dg/cpp0x/variadic91.C
index d78b791fbf46..a5ebdfe7aa2c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic91.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic91.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<int N> struct Int2Type { };
 
 template<typename... T>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic92.C b/gcc/testsuite/g++.dg/cpp0x/variadic92.C
index d382912c91f3..b7fa0006b347 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic92.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic92.C
@@ -1,5 +1,5 @@
 // Various tests for variadic templates and partial specialization.
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 // PR c++/36846
 template<typename A, typename B>
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic93.C b/gcc/testsuite/g++.dg/cpp0x/variadic93.C
index 7d8c3298e618..c17988490faa 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic93.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic93.C
@@ -1,5 +1,5 @@
 // PR c++/35297
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <class T=int, class... ARGS> 
 struct test2 {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic94.C b/gcc/testsuite/g++.dg/cpp0x/variadic94.C
index 8420f73a6a6e..213e53cab587 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic94.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic94.C
@@ -1,5 +1,5 @@
 // PR c++/40595
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<int N>
 struct S
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic95.C b/gcc/testsuite/g++.dg/cpp0x/variadic95.C
index ebb04ebc10b8..b84489aa5937 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic95.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic95.C
@@ -1,5 +1,5 @@
 // PR c++/39863
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template <typename... T>
 struct A {};
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic96.C b/gcc/testsuite/g++.dg/cpp0x/variadic96.C
index d4709d074b67..e5e7df14729d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic96.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic96.C
@@ -1,6 +1,6 @@
 // Contributed by Dodji Seketeli <dodji@redhat.com>
 // Origin: PR c++/41785
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 struct a {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic97.C b/gcc/testsuite/g++.dg/cpp0x/variadic97.C
index a2070319ebd3..8c3783251df1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic97.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic97.C
@@ -1,5 +1,5 @@
 // PR c++/42266
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 template<typename... _Elements>
   class tuple;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic98.C b/gcc/testsuite/g++.dg/cpp0x/variadic98.C
index 6af599fcaa00..a29ee8e4211a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic98.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic98.C
@@ -1,6 +1,6 @@
 // PR c++/42358
 // { dg-do assemble }
-// { dg-options -std=c++0x }
+// { dg-options -std=c++11 }
 
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic99.C b/gcc/testsuite/g++.dg/cpp0x/variadic99.C
index 457212712bd4..f6544310bc59 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic99.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic99.C
@@ -1,5 +1,5 @@
 // PR c++/43054
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename R> struct future { };
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-33964.C b/gcc/testsuite/g++.dg/cpp0x/vt-33964.C
index 0b84b6cec899..9ba9367e8da5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-33964.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-33964.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename ... Args>
 struct foo
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34050.C b/gcc/testsuite/g++.dg/cpp0x/vt-34050.C
index cb19b3914c03..fba340abfd5f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34050.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34050.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 struct A {};
 
 template<typename... T> struct B : T...
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34051-2.C b/gcc/testsuite/g++.dg/cpp0x/vt-34051-2.C
index 2c7bb50f081b..02373f890274 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34051-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34051-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> struct A
 {
   int i __attribute__((aligned(__alignof(T)))); // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34051.C b/gcc/testsuite/g++.dg/cpp0x/vt-34051.C
index 88ae56703233..7d37bf271812 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34051.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34051.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 struct A
 {
   operator int();
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34052.C b/gcc/testsuite/g++.dg/cpp0x/vt-34052.C
index 15310cfe74d0..a2e44b6cde72 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34052.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34052.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T, typename = T> struct A {}; // { dg-error "must be at the end" }
 
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34055.C b/gcc/testsuite/g++.dg/cpp0x/vt-34055.C
index c50778430e0a..3caee091862a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34055.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34055.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/34055
 template<typename...> struct A;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34102.C b/gcc/testsuite/g++.dg/cpp0x/vt-34102.C
index 00f0b4f4aace..90ef77280586 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34102.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34102.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/34102
 struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34103.C b/gcc/testsuite/g++.dg/cpp0x/vt-34103.C
index 3bbbb46a0120..e1a8574d27e7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34103.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34103.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/34103
 template<typename> struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34219-2.C b/gcc/testsuite/g++.dg/cpp0x/vt-34219-2.C
index 193bc0c6cf9a..4f145ca27216 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34219-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34219-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<template<typename... T> class Comp, typename... T> void f( T... Value)
 {
   static_assert( Comp<T>::value > 0, "" ); // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34219.C b/gcc/testsuite/g++.dg/cpp0x/vt-34219.C
index fb3584ea88d2..0cf603e8872b 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34219.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34219.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename T, T a, T... Params>
 struct max
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34314.C b/gcc/testsuite/g++.dg/cpp0x/vt-34314.C
index 4a935b367d65..6f3d01593927 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34314.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34314.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename Fun, typename... Args> // { dg-error "template parameter" }
 struct call;
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34399.C b/gcc/testsuite/g++.dg/cpp0x/vt-34399.C
index 542fae586ca8..11e7391372db 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34399.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34399.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<int...> struct A
 {
   void foo();
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34606.C b/gcc/testsuite/g++.dg/cpp0x/vt-34606.C
index 467943354424..679bb9a7a247 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34606.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34606.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<typename T, typename... U> struct A<T, U> // { dg-error "parameter packs|U" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34751.C b/gcc/testsuite/g++.dg/cpp0x/vt-34751.C
index e3ca39e798dd..f500396fc943 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34751.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34751.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // PR c++/34751
 struct A {};
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34753.C b/gcc/testsuite/g++.dg/cpp0x/vt-34753.C
index 15eaebebc883..d435138d1c36 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34753.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34753.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> struct A
 {
   template<T> struct B {}; // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34754.C b/gcc/testsuite/g++.dg/cpp0x/vt-34754.C
index 97c0065328f1..ae0c4ec71da1 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34754.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34754.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<template<int> class... T> struct A
 {
   void foo(T<0>); // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34755.C b/gcc/testsuite/g++.dg/cpp0x/vt-34755.C
index 9d5a3d1ca4d5..c642b776cb7f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34755.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34755.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename> struct A {};
 
 template<template<typename> class... T> void foo(T<int>) {} // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34919.C b/gcc/testsuite/g++.dg/cpp0x/vt-34919.C
index 829579918e16..94de312bf9ce 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34919.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34919.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<int... N> struct A
 {
   static void foo()
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-34961.C b/gcc/testsuite/g++.dg/cpp0x/vt-34961.C
index 3a872146e257..368a45309519 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-34961.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-34961.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> struct A
 {
   static const int i __attribute__((aligned(__alignof(T)))) = 0; // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35023.C b/gcc/testsuite/g++.dg/cpp0x/vt-35023.C
index 9db20503e7ef..4646b7a74b5e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35023.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35023.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> int foo()
 {
   T t; // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35024.C b/gcc/testsuite/g++.dg/cpp0x/vt-35024.C
index 77f0b66bdc02..3e2654f1e369 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35024.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35024.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> int foo()
 {
   typename T::X x; // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35026.C b/gcc/testsuite/g++.dg/cpp0x/vt-35026.C
index 643a416c5787..491537df977f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35026.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35026.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename... T> struct A
 {
   T* x[1]; // { dg-error "parameter packs|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35147.C b/gcc/testsuite/g++.dg/cpp0x/vt-35147.C
index fecb36ec8c9a..3b2250baeef5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35147.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35147.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<typename _Tp>
   _Tp&& forward(_Tp&& __t) { return __t; } // { dg-message "note" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35242.C b/gcc/testsuite/g++.dg/cpp0x/vt-35242.C
index 9cc859b875e4..2df4bae49229 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35242.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35242.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 struct A
 {
   template<typename... T> struct B;
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35243.C b/gcc/testsuite/g++.dg/cpp0x/vt-35243.C
index 4b5557442690..a425528b233a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35243.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35243.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 struct A {};
 
 template<typename... T> struct B : T...
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-35331.C b/gcc/testsuite/g++.dg/cpp0x/vt-35331.C
index 0add9819bd04..06fda6191020 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-35331.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-35331.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 template<typename...> struct A;
 
 template<typename...T> struct A<T*> // { dg-error "not expanded|T" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-37737-1.C b/gcc/testsuite/g++.dg/cpp0x/vt-37737-1.C
index de11b1651b43..8745dde372e2 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-37737-1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-37737-1.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 // { dg-prune-output "note" }
 
 void f() { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-37737-2.C b/gcc/testsuite/g++.dg/cpp0x/vt-37737-2.C
index 5514259ec3f4..178db4f7c193 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-37737-2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-37737-2.C
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template<class U, class... T>
 void f()			// { dg-message "note" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-40092.C b/gcc/testsuite/g++.dg/cpp0x/vt-40092.C
index ecb698061305..f3b53d002290 100644
--- a/gcc/testsuite/g++.dg/cpp0x/vt-40092.C
+++ b/gcc/testsuite/g++.dg/cpp0x/vt-40092.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++0x" }
+// { dg-options "-std=c++11" }
 
 template <typename... Types> struct package {};