Merge commit '4f01ae3761ca1f8dd7a33b833ae30624f047ac9c' into HEAD

diff --cc gcc/Makefile.in
Simple merge

diff --cc gcc/configure
Simple merge

diff --cc gcc/configure.ac
Simple merge

diff --cc gcc/diagnostic.cc
Simple merge

diff --cc libcpp/charset.cc
Simple merge

diff --cc libcpp/include/cpplib.h
index 6779bb0d58b2931d77a57ce1bdd6c3fa49924e02,d326f5aa316f82ebae304dc5bbed19766bb46ca9..282d1c817ab1f72ad293a2c5f0764c3aa94517b9
--- 1/libcpp/include/cpplib.h
--- 2/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@@ -1602,11 -1602,7 +1602,14 @@@ bool cpp_input_conversion_is_trivial (c
  int cpp_check_utf8_bom (const char *data, size_t data_length);
  bool cpp_valid_utf8_p (const char *data, size_t num_bytes);
  
+ bool cpp_is_combining_char (cppchar_t c);
+ bool cpp_is_printable_char (cppchar_t c);
+ 
 +enum {
 +   XID_START = 1,
 +   XID_CONTINUE = 2
 +};
 +
 +unsigned int check_xid_property (cppchar_t c);
 +
  #endif /* ! LIBCPP_CPPLIB_H */