diff options
| author | DJ Delorie <dj@redhat.com> | 2011-11-08 16:01:58 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2011-11-08 16:01:58 +0000 |
| commit | 956a8f8beb7b830faf126c48025f44628a365a14 (patch) | |
| tree | 607434fc7940cca338818911ade3cb454d8bce78 /include | |
| parent | 6746a626dcc77ce098ae890427f7991940158ca5 (diff) | |
| download | gdb-956a8f8beb7b830faf126c48025f44628a365a14.zip gdb-956a8f8beb7b830faf126c48025f44628a365a14.tar.gz gdb-956a8f8beb7b830faf126c48025f44628a365a14.tar.bz2 | |
merge from gcc
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 c8af7fb..01854a4 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-11-01 DJ Delorie <dj@redhat.com> * dis-asm.h (print_insn_rl78): Declare. diff --git a/include/demangle.h b/include/demangle.h index 960e88e..98b11d7 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. */ |