--- a/gcc/pretty-print.h	Fri Feb 12 23:41:23 2010 +0900
+++ b/gcc/pretty-print.h	Mon May 24 12:47:05 2010 +0900
@@ -1,5 +1,6 @@
 /* Various declarations for language-independent pretty-print subroutines.
-   Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
    Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net>
 
 This file is part of GCC.
@@ -35,7 +36,7 @@
   va_list *args_ptr;
   int err_no;  /* for %m */
   location_t *locus;
-  tree *abstract_origin;
+  void **x_data;
 } text_info;
 
 /* How often diagnostics are prefixed by their locations:
@@ -284,12 +285,6 @@
 #define pp_identifier(PP, ID)  pp_string (PP, (pp_translate_identifiers (PP) \
 					  ? identifier_to_locale (ID)	\
 					  : (ID)))
-#define pp_tree_identifier(PP, T)                      \
-  pp_base_tree_identifier (pp_base (PP), T)
-
-#define pp_unsupported_tree(PP, T)                         \
-  pp_verbatim (pp_base (PP), "#%qs not supported by %s#", \
-               tree_code_name[(int) TREE_CODE (T)], __FUNCTION__)
 
 
 #define pp_buffer(PP) pp_base (PP)->buffer
@@ -331,7 +326,6 @@
 extern void pp_base_string (pretty_printer *, const char *);
 extern void pp_write_text_to_stream (pretty_printer *pp);
 extern void pp_base_maybe_space (pretty_printer *);
-extern void pp_base_tree_identifier (pretty_printer *, tree);
 
 /* Switch into verbatim mode and return the old mode.  */
 static inline pp_wrapping_mode_t