diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-07-02 23:45:27 +0400 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-07-02 23:45:27 +0400 |
| commit | 9b2d2a364c41c3e5b84bd6dacbfd0821c8322d80 (patch) | |
| tree | 179dd589a547d40c9dab8b6c8f01dcec06e4ebf4 | |
| parent | 84142930450c4242aed4405e5fc3d0390eaef661 (diff) | |
commit d5b397191d6242fa1b0941cdb328c421bf2b09a0gdb_7_3-2011-07-26-release
Author: DJ Delorie <dj@delorie.com>
Date: Mon Jun 13 23:01:42 2011 +0000
merge from gcc
include/
* demangle.h (DMGL_RET_POSTFIX): Extend the comment.
(DMGL_RET_DROP): New.
libiberty/
* cp-demangle.c (d_print_comp) <DEMANGLE_COMPONENT_FUNCTION_TYPE>:
Suppress d_print_mod for DMGL_RET_POSTFIX.
* testsuite/demangle-expected: New testcases for --ret-postfix.
* cp-demangle.c (d_print_comp) <DEMANGLE_COMPONENT_FUNCTION_TYPE>: Do
not pass DMGL_RET_POSTFIX or DMGL_RET_DROP. Support DMGL_RET_DROP.
* testsuite/demangle-expected: New testcases for --ret-drop.
* testsuite/test-demangle.c: Document --ret-drop in a comment.
(main): New variable ret_drop, fill it, call cplus_demangle with it.
* cp-demangle.c (struct d_print_info): Remove field options.
(d_print_init): Remove parameter options.
(cplus_demangle_print_callback): Update all the callers.
(d_print_comp, d_print_mod_list, d_print_mod, d_print_function_type)
(d_print_array_type, d_print_expr_op, d_print_cast, d_print_subexpr):
Add parameter options, update all the callers.
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/demangle.h | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 7c18850fd..fc1dd5667 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2011-07-02 Jan Kratochvil <jan.kratochvil@redhat.com> + + * demangle.h (DMGL_RET_POSTFIX): Extend the comment. + (DMGL_RET_DROP): New. + 2011-03-31 Tristan Gingold <gingold@adacore.com> * dwarf2.h (dwarf_line_number_hp_sfc_ops): New enum. diff --git a/include/demangle.h b/include/demangle.h index c0624559e..53f6c54f5 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -45,7 +45,13 @@ extern "C" { #define DMGL_VERBOSE (1 << 3) /* Include implementation details. */ #define DMGL_TYPES (1 << 4) /* Also try to demangle type encodings. */ #define DMGL_RET_POSTFIX (1 << 5) /* Print function return types (when - present) after function signature */ + present) after function signature. + It applies only to the toplevel + function type. */ +#define DMGL_RET_DROP (1 << 6) /* Suppress printing function return + types, even if present. It applies + only to the toplevel function type. + */ #define DMGL_AUTO (1 << 8) #define DMGL_GNU (1 << 9) |