From 9a2873437e3a0fd4bb10287c044aa68ecaef722b Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 23 Sep 2011 22:21:28 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog  | 6 ++++++
 include/demangle.h | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index 1a4680ed2..fb7285a65 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-23  Cary Coutant  <ccoutant@google.com>
+
+	PR 40831
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_CLONE.
+
 2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/12975
diff --git a/include/demangle.h b/include/demangle.h
index 53f6c54f5..960e88e0f 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -402,7 +402,9 @@ enum demangle_component_type
   /* An unnamed type.  */
   DEMANGLE_COMPONENT_UNNAMED_TYPE,
   /* A pack expansion.  */
-  DEMANGLE_COMPONENT_PACK_EXPANSION
+  DEMANGLE_COMPONENT_PACK_EXPANSION,
+  /* A cloned function.  */
+  DEMANGLE_COMPONENT_CLONE
 };
 
 /* Types which are only used internally.  */