From 8fe0d347924e7cd2d9c3e7889548106c016bac5f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 21 Nov 2003 21:02:26 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 8 ++++++++ libiberty/testsuite/demangle-expected | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 13103ea53e9..c85b73c3e58 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2003-11-20 Ian Lance Taylor + + * testsuite/demangle-expected: Minor changes to match output of + new demangler: adjust whitespace in four tests, and change order + of qualifiers in one test. + + * cp-demangle.c: Complete rewrite. + 2003-11-20 Ian Lance Taylor * cp-demangle.c: Complete rewrite. diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 8dfab8e9bd0..ca8b85858f0 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -2629,7 +2629,7 @@ operator<<(X const&, X const&) # --format=gnu-v3 _ZN3FooIA4_iE3barE -Foo::bar +Foo::bar # --format=gnu-v3 _Z1fIiEvi @@ -2697,7 +2697,7 @@ typeinfo for a_class # --format=gnu-v3 U4_farrVKPi -int* restrict volatile const _far +int* const volatile restrict _far # --format=gnu-v3 _Z3fooILi2EEvRAplT_Li1E_i @@ -2749,11 +2749,11 @@ f(int (* const)(int)) # --format=gnu-v3 _Z1fAszL_ZZNK1N1A1fEvE3foo_0E_i -f(int[sizeof(N::A::f() const::foo)]) +f(int [sizeof (N::A::f() const::foo)]) # --format=gnu-v3 _Z1fA37_iPS_ -f(int[37], int (*) [37]) +f(int [37], int (*) [37]) # --format=gnu-v3 _Z1fM1AFivEPS0_ @@ -2777,7 +2777,7 @@ s(int (*) [37], int (**) [37]) # --format=gnu-v3 _Z3fooA30_A_i -foo(int[30][]) +foo(int [30][]) # --format=gnu-v3 _Z3kooPA28_A30_i -- 2.30.2