merge from gcc

This commit is contained in:
DJ Delorie 2002-02-05 17:53:03 +00:00
parent 994fa212ea
commit bf317e4b79
2 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2002-02-05 Jason Merrill <jason@redhat.com>
* demangle.h (cplus_demangle_v3): Add "options" parm.
(cplus_demangle_v3_type): Remove prototype.
(DMGL_VERBOSE): New macro.
(DMGL_TYPES): New macro.
2002-02-02 H.J. Lu (hjl@gnu.org) 2002-02-02 H.J. Lu (hjl@gnu.org)
* demangle.h (cplus_demangle_v3_type): New prototype. * demangle.h (cplus_demangle_v3_type): New prototype.

View File

@ -29,6 +29,8 @@
#define DMGL_PARAMS (1 << 0) /* Include function args */ #define DMGL_PARAMS (1 << 0) /* Include function args */
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */ #define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
#define DMGL_JAVA (1 << 2) /* Demangle as Java rather than C++. */ #define DMGL_JAVA (1 << 2) /* Demangle as Java rather than C++. */
#define DMGL_VERBOSE (1 << 3) /* Include implementation details. */
#define DMGL_TYPES (1 << 4) /* Also try to demangle type encodings. */
#define DMGL_AUTO (1 << 8) #define DMGL_AUTO (1 << 8)
#define DMGL_GNU (1 << 9) #define DMGL_GNU (1 << 9)
@ -125,12 +127,7 @@ cplus_demangle_name_to_style PARAMS ((const char *name));
/* V3 ABI demangling entry points, defined in cp-demangle.c. */ /* V3 ABI demangling entry points, defined in cp-demangle.c. */
extern char* extern char*
cplus_demangle_v3 PARAMS ((const char* mangled)); cplus_demangle_v3 PARAMS ((const char* mangled, int options));
/* 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* extern char*
java_demangle_v3 PARAMS ((const char* mangled)); java_demangle_v3 PARAMS ((const char* mangled));