aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c.opt9
-rw-r--r--gcc/doc/invoke.texi6
3 files changed, 12 insertions, 7 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0c22f89..6830fd5 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-07 Jason Merrill <jason@redhat.com>
+
+ * c.opt: Add -std=c++14.
+
2014-03-06 Marek Polacek <polacek@redhat.com>
PR c/60197
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index aad54e2..93fb7c2 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1349,15 +1349,18 @@ Conform to the ISO 1998 C++ standard revised by the 2003 technical corrigendum
std=c++11
C++ ObjC++
-Conform to the ISO 2011 C++ standard (experimental and incomplete support)
+Conform to the ISO 2011 C++ standard
std=c++0x
-C++ ObjC++ Alias(std=c++11)
+C++ ObjC++ Alias(std=c++11) Undocumented
Deprecated in favor of -std=c++11
std=c++1y
C++ ObjC++
-Conform to the ISO 201y(7?) C++ draft standard (experimental and incomplete support)
+Conform to the ISO 2014(?) C++ draft standard (experimental and incomplete support)
+
+std=c++14
+C++ ObjC++ Alias(std=c++1y) Undocumented
std=c11
C ObjC
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 4a5caa3..2ee091a 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1722,14 +1722,12 @@ C++ code.
@item c++11
@itemx c++0x
-The 2011 ISO C++ standard plus amendments. Support for C++11 is still
-experimental, and may change in incompatible ways in future releases.
+The 2011 ISO C++ standard plus amendments.
The name @samp{c++0x} is deprecated.
@item gnu++11
@itemx gnu++0x
-GNU dialect of @option{-std=c++11}. Support for C++11 is still
-experimental, and may change in incompatible ways in future releases.
+GNU dialect of @option{-std=c++11}.
The name @samp{gnu++0x} is deprecated.
@item c++1y