diff options
| author | Aldy Hernandez <aldyh@gcc.gnu.org> | 2011-11-08 11:13:41 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2011-11-08 11:13:41 +0000 |
| commit | 0a35513e4e73ec9c6f24e791d344308ad3ed030d (patch) | |
| tree | e07de8d0b6265f8d72388d335bd471022e753d57 /include | |
| parent | 287188ea072dd887a17dd56360531c3a22307e7c (diff) | |
| download | gcc-0a35513e4e73ec9c6f24e791d344308ad3ed030d.tar.gz | |
Merge from transactional-memory branch.
From-SVN: r181154
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 9 | ||||
| -rw-r--r-- | include/demangle.h | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index d5701f40772..df131629f2b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,12 @@ +2011-11-07 Richard Henderson <rth@redhat.com> + + Merged from transactional-memory. + + * demangle.h (enum gnu_v3_ctor_kinds): Add gnu_v3_object_ctor_group. + (enum gnu_v3_dtor_kinds): Add gnu_v3_object_dtor_group. + (DEMANGLE_COMPONENT_TRANSACTION_CLONE): New. + (DEMANGLE_COMPONENT_NONTRANSACTION_CLONE): New. + 2011-10-21 Ulrich Drepper <drepper@gmail.com> * obstack.h [!GNUC] (obstack_free): Avoid cast to int. diff --git a/include/demangle.h b/include/demangle.h index 960e88e0f2a..98b11d796f4 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -172,7 +172,8 @@ ada_demangle (const char *mangled, int options); enum gnu_v3_ctor_kinds { gnu_v3_complete_object_ctor = 1, gnu_v3_base_object_ctor, - gnu_v3_complete_object_allocating_ctor + gnu_v3_complete_object_allocating_ctor, + gnu_v3_object_ctor_group }; /* Return non-zero iff NAME is the mangled form of a constructor name @@ -186,7 +187,8 @@ extern enum gnu_v3_ctor_kinds enum gnu_v3_dtor_kinds { gnu_v3_deleting_dtor = 1, gnu_v3_complete_object_dtor, - gnu_v3_base_object_dtor + gnu_v3_base_object_dtor, + gnu_v3_object_dtor_group }; /* Return non-zero iff NAME is the mangled form of a destructor name @@ -401,6 +403,13 @@ enum demangle_component_type DEMANGLE_COMPONENT_DEFAULT_ARG, /* An unnamed type. */ DEMANGLE_COMPONENT_UNNAMED_TYPE, + /* A transactional clone. This has one subtree, the encoding for + which it is providing alternative linkage. */ + DEMANGLE_COMPONENT_TRANSACTION_CLONE, + /* A non-transactional clone entry point. In the i386/x86_64 abi, + the unmangled symbol of a tm_callable becomes a thunk and the + non-transactional function version is mangled thus. */ + DEMANGLE_COMPONENT_NONTRANSACTION_CLONE, /* A pack expansion. */ DEMANGLE_COMPONENT_PACK_EXPANSION, /* A cloned function. */ |