merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 20c88d7..ee01caf 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-04  Tom Tromey  <tromey@redhat.com>
+
+       * testsuite/demangle-expected: Add missing --format=gnu-v3.
+
 2010-02-03  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (d_expression): Handle dependent operator name.

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 0f85ddc..010faec 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -3932,6 +3932,7 @@ f(float vector[32])
 --format=gnu-v3
 _Z1fIfLi4EEvDv_T0__T_
 void f<float, 4>(float vector[4])
+--format=gnu-v3
 _Z1fI1AEDTclonplfp_fp_EET_
 decltype ((operator+)({parm#1}, {parm#1})) f<A>(A)
 --format=gnu-v3