aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-06-07 17:52:46 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-06-07 17:52:46 -0400
commit6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0 (patch)
treecd3370eefb28aa48d04d2f202735041192d37e39 /gcc/c-family
parent338efe0d54885f66865f9c09f87ee413f7b6f1a2 (diff)
downloadgcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.zip
gcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.tar.gz
gcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.tar.bz2
pretty-print.h (ATTRIBUTE_GCC_PPDIAG): Use GCC_DIAG_STYLE if set.
gcc/ * pretty-print.h (ATTRIBUTE_GCC_PPDIAG): Use GCC_DIAG_STYLE if set. gcc/c-family/ * c-format.c (gcc_cxxdiag_char_table): Add 'S' format. From-SVN: r174770
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-format.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1c5f9d3..0e71e37 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-07 Jason Merrill <jason@redhat.com>
+
+ * c-format.c (gcc_cxxdiag_char_table): Add 'S' format.
+
2011-06-07 Richard Guenther <rguenther@suse.de>
* c-common.c (c_common_nodes_and_builtins): Do not set
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 66012c4..9fabc39 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -740,7 +740,7 @@ static const format_char_info gcc_cxxdiag_char_table[] =
/* Custom conversion specifiers. */
/* These will require a "tree" at runtime. */
- { "ADEFKTV",0,STD_C89,{ T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q+#", "", NULL },
+ { "ADEFKSTV",0,STD_C89,{ T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q+#", "", NULL },
{ "v", 0,STD_C89, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "q#", "", NULL },