merge from gcc

[deliverable/binutils-gdb.git] / libiberty / ChangeLog

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ff35eb18276f34b6d6846c2046c7c3d5d29178d0..3ebf3c17662ab86e151b501ba5b9667da565c6f8 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,27 @@
+2013-09-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR bootstrap/58386
+       Revert:
+
+       2013-09-10  Gary Benson  <gbenson@redhat.com>
+
+       * cp-demangle.c: Include hashtab.h.
+       (struct d_print_info): New field saved_scopes.
+       (d_print_init): Initialize the above.
+       (d_print_free): New function.
+       (cplus_demangle_print_callback): Call the above.
+       (struct d_saved_scope): New structure.
+       (d_store_scope): New function.
+       (d_free_scope) Likewise.
+       (d_restore_scope) Likewise.
+       (d_hash_saved_scope) Likewise.
+       (d_equal_saved_scope) Likewise.
+       (d_print_comp): New variable saved_scope.
+       [DEMANGLE_COMPONENT_REFERENCE,
+       DEMANGLE_COMPONENT_RVALUE_REFERENCE]: Capture scope the first
+       time the component is traversed, and use the captured scope for
+       subsequent traversals.
+
 2013-09-10  Gary Benson  <gbenson@redhat.com>
 
        * cp-demangle.c: Include hashtab.h.