merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 74c0ead4bcb2760dabd08fefb566533a4dcbebeb..aec79eed7f11768fa7f51c608a3dae6f0deee428 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * demangle.h
+       (enum demangle_component_type <DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS>)
+       (enum demangle_component_type <DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS>):
+       New.
+
 2009-07-10  Tom Tromey  <tromey@redhat.com>
 
        * dwarf2.h: New file, moved from elf/.

diff --git a/include/demangle.h b/include/demangle.h
index eb39c7c13c4df9686825a56f86846960283a87dd..0bcae2fdbbb38a90fe15663b0fc1bccb94469281 100644 (file)
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -377,6 +377,10 @@ enum demangle_component_type
   DEMANGLE_COMPONENT_CHARACTER,
   /* A decltype type.  */
   DEMANGLE_COMPONENT_DECLTYPE,
+  /* Global constructors keyed to name.  */
+  DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS,
+  /* Global destructors keyed to name.  */
+  DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS,
   /* A pack expansion.  */
   DEMANGLE_COMPONENT_PACK_EXPANSION
 };