aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-02-05 17:53:03 +0000
committerDJ Delorie <dj@redhat.com>2002-02-05 17:53:03 +0000
commitbf317e4b797d7e08e5f6a3c932563605ad630e33 (patch)
tree7181e400b8952117f5bfc8cb7561310bab308434
parent994fa212ea62d62c57cca3947ddfc818afa3b316 (diff)
downloadnewlib-bf317e4b797d7e08e5f6a3c932563605ad630e33.zip
newlib-bf317e4b797d7e08e5f6a3c932563605ad630e33.tar.gz
newlib-bf317e4b797d7e08e5f6a3c932563605ad630e33.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog7
-rw-r--r--include/demangle.h9
2 files changed, 10 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 59561b8..9ac65a0 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -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)
* demangle.h (cplus_demangle_v3_type): New prototype.
diff --git a/include/demangle.h b/include/demangle.h
index cbe2804..ad0569a 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -29,6 +29,8 @@
#define DMGL_PARAMS (1 << 0) /* Include function args */
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
#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_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. */
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));
+cplus_demangle_v3 PARAMS ((const char* mangled, int options));
extern char*
java_demangle_v3 PARAMS ((const char* mangled));