espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 09:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie
2010-11-13 02:20:31 +00:00
parent df6008afc8
commit 361c311554
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libiberty/ChangeLog
View File

@ -1,3 +1,10 @@
2010-11-12 Ian Lance Taylor <iant@google.com>
PR other/46332
* cp-demangle.c (d_print_function_type): Don't print parentheses
if there are no modifiers to print.
* testsuite/demangle-expected: Tweak one test case, add another.
2010-11-04 Richard Henderson <rth@redhat.com> 2010-11-04 Richard Henderson <rth@redhat.com>
* configure.ac (AC_CHECK_HEADERS): Add process.h. * configure.ac (AC_CHECK_HEADERS): Add process.h.

6
libiberty/cp-demangle.c
View File

@ -4546,20 +4546,17 @@ d_print_function_type (struct d_print_info *dpi,
struct d_print_mod *mods) struct d_print_mod *mods)
{ {
int need_paren; int need_paren;
int saw_mod;
int need_space; int need_space;
struct d_print_mod *p; struct d_print_mod *p;
struct d_print_mod *hold_modifiers; struct d_print_mod *hold_modifiers;
need_paren = 0; need_paren = 0;
saw_mod = 0;
need_space = 0; need_space = 0;
for (p = mods; p != NULL; p = p->next) for (p = mods; p != NULL; p = p->next)
{ {
if (p->printed) if (p->printed)
break; break;
saw_mod = 1;
switch (p->mod->type) switch (p->mod->type)
{ {
case DEMANGLE_COMPONENT_POINTER: case DEMANGLE_COMPONENT_POINTER:
@ -4588,9 +4585,6 @@ d_print_function_type (struct d_print_info *dpi,
break; break;
} }
if (d_left (dc) != NULL && ! saw_mod)
need_paren = 1;
if (need_paren) if (need_paren)
{ {
if (! need_space) if (! need_space)

9
libiberty/testsuite/demangle-expected
View File

@ -3325,8 +3325,13 @@ first<Duo>
# #
--format=gnu-v3 --no-params --format=gnu-v3 --no-params
_Z3fooIiFvdEiEvv _Z3fooIiFvdEiEvv
void foo<int, void ()(double), int>() void foo<int, void (double), int>()
foo<int, void ()(double), int> foo<int, void (double), int>
#
--format=gnu-v3 --no-params
_Z1fIFvvEEvv
void f<void ()>()
f<void ()>
# #
--format=gnu-v3 --no-params --format=gnu-v3 --no-params
_ZN1N1fE _ZN1N1fE