From 031cd59b641f9ecf988230e162f06ca2faac93cd Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 17 Jul 2009 20:20:39 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog  | 7 +++++++
 include/demangle.h | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/include/ChangeLog b/include/ChangeLog
index 74c0ead4b..aec79eed7 100644
--- 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 eb39c7c13..0bcae2fdb 100644
--- 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
 };