diff options
| author | Jason Merrill <jason@redhat.com> | 2014-11-04 09:55:32 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-11-04 09:55:32 -0500 |
| commit | 0dadf728957897aa0afdcf733632edbe81b1b43a (patch) | |
| tree | fdc092a42af6ce0b6cd39020fb748a5ccfcec099 /gcc | |
| parent | 0caee3cadf0d060ee6b2959b49f97002564cede9 (diff) | |
| download | gcc-0dadf728957897aa0afdcf733632edbe81b1b43a.zip gcc-0dadf728957897aa0afdcf733632edbe81b1b43a.tar.gz gcc-0dadf728957897aa0afdcf733632edbe81b1b43a.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++-dg.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/target-supports.exp | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2b4ef77..4c563cc 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 308f306..8f79cbf 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 3361c2f..e5b04ec 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 { } { |