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