From 7955ede528e6b989ed6a600464b44145af0abed2 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 23 Sep 2011 22:21:36 +0000 Subject: merge from gcc --- include/ChangeLog | 6 ++++++ include/demangle.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 1a4680e..fb7285a 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2011-09-23 Cary Coutant + + PR 40831 + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_CLONE. + 2011-09-15 H.J. Lu PR ld/12975 diff --git a/include/demangle.h b/include/demangle.h index 53f6c54..960e88e 100644 --- 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. */ -- cgit v1.1