merge from gcc

2012-10-10 03:11:22 +00:00
parent 64f6e90ef7
commit 51107c1dd9
3 changed files with 15 additions and 2 deletions
--- a/include/demangle.h
+++ b/include/demangle.h
@ -272,6 +272,9 @@ enum demangle_component_type
  /* A guard variable.  This has one subtree, the name for which this
     is a guard variable.  */
  DEMANGLE_COMPONENT_GUARD,
+  /* The init and wrapper functions for C++11 thread_local variables.  */
+  DEMANGLE_COMPONENT_TLS_INIT,
+  DEMANGLE_COMPONENT_TLS_WRAPPER,
  /* A reference temporary.  This has one subtree, the name for which
     this is a temporary.  */
  DEMANGLE_COMPONENT_REFTEMP,