From 2d15421aa8f802cd987098fe6d13462c0b383c1a Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 23 Dec 2013 18:30:21 +0000 Subject: merge from gcc --- include/ChangeLog | 7 +++++++ include/demangle.h | 8 ++++++++ 2 files changed, 15 insertions(+) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index a071735c2..3a8054505 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2013-12-23 Bill Maddox + + * demangle.h (enum gnu_v3_ctor_kinds): + Added literal gnu_v3_unified_ctor. + (enum gnu_v3_ctor_kinds): + Added literal gnu_v3_unified_dtor. + 2013-12-04 Richard Sandiford * longlong.h: New file. diff --git a/include/demangle.h b/include/demangle.h index 58bf547d5..bbad71bd8 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -173,6 +173,10 @@ enum gnu_v3_ctor_kinds { gnu_v3_complete_object_ctor = 1, gnu_v3_base_object_ctor, gnu_v3_complete_object_allocating_ctor, + /* These are not part of the V3 ABI. Unified constructors are generated + as a speed-for-space optimization when the -fdeclone-ctor-dtor option + is used, and are always internal symbols. */ + gnu_v3_unified_ctor, gnu_v3_object_ctor_group }; @@ -188,6 +192,10 @@ enum gnu_v3_dtor_kinds { gnu_v3_deleting_dtor = 1, gnu_v3_complete_object_dtor, gnu_v3_base_object_dtor, + /* These are not part of the V3 ABI. Unified destructors are generated + as a speed-for-space optimization when the -fdeclone-ctor-dtor option + is used, and are always internal symbols. */ + gnu_v3_unified_dtor, gnu_v3_object_dtor_group }; -- cgit v1.2.3