From: Jason Merrill <jason@redhat.com>
Date: Tue, 4 Nov 2014 14:55:32 +0000 (-0500)
Subject: g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0dadf728957897aa0afdcf733632edbe81b1b43a;p=gcc.git

g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.

	* lib/g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.
	* lib/target-supports.exp (check_effective_target_c++14_only): Likewise.

From-SVN: r217085
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b4ef77914a..4c563cc6924 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-04  Jason Merrill  <jason@redhat.com>
+
+	* lib/g++-dg.exp (g++-dg-runtest): Change -std=c++1y to -std=c++14.
+	* lib/target-supports.exp (check_effective_target_c++14_only): Likewise.
+
 2014-11-04  Andrew Stubbs  <ams@codesourcery.com>
 
 	gcc/testsuite/
diff --git a/gcc/testsuite/lib/g++-dg.exp b/gcc/testsuite/lib/g++-dg.exp
index 308f3062038..8f79cbf29e6 100644
--- a/gcc/testsuite/lib/g++-dg.exp
+++ b/gcc/testsuite/lib/g++-dg.exp
@@ -43,9 +43,9 @@ proc g++-dg-runtest { testcases flags default-extra-flags } {
 	# if there's a dg-options line.
 	if ![search_for $test "-std=*++"] {
 	    if [search_for $test "dg-options"] {
-		set option_list { -std=gnu++98 -std=gnu++11 -std=gnu++1y }
+		set option_list { -std=gnu++98 -std=gnu++11 -std=gnu++14 }
 	    } else {
-		set option_list { -std=c++98 -std=c++11 -std=c++1y }
+		set option_list { -std=c++98 -std=c++11 -std=c++14 }
 	    }
 	} else {
 	    set option_list { "" }
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 3361c2f9e8d..e5b04ec5f90 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -5706,7 +5706,7 @@ proc check_effective_target_c++14_only { } {
     if ![check_effective_target_c++] {
 	return 0
     }
-    return [check-flags { { } { } { -std=c++1y -std=gnu++1y -std=c++14 -std=gnu++14 } }]
+    return [check-flags { { } { } { -std=c++14 -std=gnu++14 -std=c++14 -std=gnu++14 } }]
 }
 
 proc check_effective_target_c++14 { } {