merge from gcc

include/ChangeLog

@@ -1,3 +1,7 @@
+2002-02-02  H.J. Lu  (hjl@gnu.org)
+
+	* demangle.h (cplus_demangle_v3_type): New prototype.
+
 2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
 
 	* dis-asm.h : Add support for or32 targets

include/demangle.h

@@ -127,6 +127,11 @@ cplus_demangle_name_to_style PARAMS ((const char *name));
 extern char*
 cplus_demangle_v3 PARAMS ((const char* mangled));
 
+/* V3 ABI demangling entry points, defined in cp-demangle.c. Also
+   demagle types. */
+extern char*
+cplus_demangle_v3_type PARAMS ((const char* mangled));
+
 extern char*
 java_demangle_v3 PARAMS ((const char* mangled));