merge from gcc

2011-09-23 22:21:28 +00:00 · 2011-09-23 22:21:28 +00:00 · 9a2873437e
parent 7661a752ca
commit 9a2873437e
2 changed files with 9 additions and 1 deletions
--- 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
--- 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.  */