diff options
| author | DJ Delorie <dj@redhat.com> | 2004-02-25 02:04:37 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2004-02-25 02:04:37 +0000 |
| commit | 099f84cfbae3923e0e38a74d792c7a9bfc38f57a (patch) | |
| tree | b4e47160845206f0d51fd4e59110cdf4e028b99d | |
| parent | 4cfcaf218cfb0fd0601725074a732689c1155e22 (diff) | |
| download | gdb-099f84cfbae3923e0e38a74d792c7a9bfc38f57a.zip gdb-099f84cfbae3923e0e38a74d792c7a9bfc38f57a.tar.gz gdb-099f84cfbae3923e0e38a74d792c7a9bfc38f57a.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/dyn-string.h | 2 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 4 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 4e1ab9f..37c6cfd 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2004-02-24 Ian Lance Taylor <ian@wasabisystems.com> + + * dyn-string.h: Update copyright date. + 2004-02-23 Ian Lance Taylor <ian@wasabisystems.com> * dyn-string.h: Remove test of IN_LIBGCC2 and IN_GLIBCPP_V3 and diff --git a/include/dyn-string.h b/include/dyn-string.h index aa5e385..85f88b1 100644 --- a/include/dyn-string.h +++ b/include/dyn-string.h @@ -1,5 +1,5 @@ /* An abstract string datatype. - Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc. Contributed by Mark Mitchell (mark@markmitchell.com). This file is part of GCC. diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e21c34f..58a1142 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,10 @@ 2004-02-24 Ian Lance Taylor <ian@wasabisystems.com> + * cp-demangle.c (d_print_comp) [UNARY]: Don't emit extra + parentheses around a cast. + * testsuite/demangle-expected: Adjust two test cases to match new + output. + * cp-demangle.c (__cxa_demangle): Pass DMGL_PARAMS to d_demangle. * cp-demangle.c (d_print_comp) [RESTRICT, VOLATILE, CONST]: Don't diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 1205fcb..47ec095 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3277,15 +3277,13 @@ d_print_comp (dpi, dc) d_print_expr_op (dpi, d_left (dc)); else { - d_append_string_constant (dpi, "(("); + d_append_char (dpi, '('); d_print_cast (dpi, d_left (dc)); d_append_char (dpi, ')'); } d_append_char (dpi, '('); d_print_comp (dpi, d_right (dc)); d_append_char (dpi, ')'); - if (d_left (dc)->type == DEMANGLE_COMPONENT_CAST) - d_append_char (dpi, ')'); return; case DEMANGLE_COMPONENT_BINARY: diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 5ede7ab..df32587 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -3591,13 +3591,13 @@ hairyfunc5 # This is from gcc PR 8861 --format=gnu-v3 --no-params _Z1fILi1ELc120EEv1AIXplT_cviLd810000000000000000703DAD7A370C5EEE -void f<1, 120>(A<(1) + (((int)((double)810000000000000000703DAD7A370C5)))>) +void f<1, 120>(A<(1) + ((int)((double)810000000000000000703DAD7A370C5))>) f<1, 120> # # This is also from gcc PR 8861 --format=gnu-v3 --no-params _Z1fILi1EEv1AIXplT_cvingLf3f800000EEE -void f<1>(A<(1) + (((int)(-((float)3f800000))))>) +void f<1>(A<(1) + ((int)(-((float)3f800000)))>) f<1> # # This is from a libstdc++ debug mode patch. |