diff options
| author | DJ Delorie <dj@redhat.com> | 2010-03-22 21:39:44 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-03-22 21:39:44 +0000 |
| commit | f9b58c5ba68696e797030f26a469cc432cf20397 (patch) | |
| tree | 3602c5736732e80d5ca0e69ce757f5c8dda11f83 | |
| parent | c847d045a6a4948c2ce42d90e1ef2de17bace896 (diff) | |
| download | gdb-f9b58c5ba68696e797030f26a469cc432cf20397.zip gdb-f9b58c5ba68696e797030f26a469cc432cf20397.tar.gz gdb-f9b58c5ba68696e797030f26a469cc432cf20397.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 4 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index cf80e38..176dd4d 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2010-03-22 Jason Merrill <jason@redhat.com> + + * cp-demangle.c (d_print_mod): Use () rather than [] for vectors. + 2010-03-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in (all): Do not use exec. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index b1319cf..98c64db5 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -4506,9 +4506,9 @@ d_print_mod (struct d_print_info *dpi, d_print_comp (dpi, d_left (mod)); return; case DEMANGLE_COMPONENT_VECTOR_TYPE: - d_append_string (dpi, " vector["); + d_append_string (dpi, " __vector("); d_print_comp (dpi, d_left (mod)); - d_append_char (dpi, ']'); + d_append_char (dpi, ')'); return; default: diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 010faec..672f352 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -3928,10 +3928,10 @@ _Z1fN1SUt_E f(S::{unnamed type#1}) --format=gnu-v3 _Z1fDv32_f -f(float vector[32]) +f(float __vector(32)) --format=gnu-v3 _Z1fIfLi4EEvDv_T0__T_ -void f<float, 4>(float vector[4]) +void f<float, 4>(float __vector(4)) --format=gnu-v3 _Z1fI1AEDTclonplfp_fp_EET_ decltype ((operator+)({parm#1}, {parm#1})) f<A>(A) |