From 995b61fe5b880e79b767160207fd363b125fdaa3 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Wed, 10 Oct 2012 03:11:33 +0000
Subject: merge from gcc

---
 include/ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'include/ChangeLog')

diff --git a/include/ChangeLog b/include/ChangeLog
index 4a535eb..e702ebe 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,13 @@
+2012-10-08  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_TLS_INIT and DEMANGLE_COMPONENT_TLS_WRAPPER.
+
+2012-09-18  Florian Weimer  <fweimer@redhat.com>
+
+	PR other/54411
+	* objalloc.h (objalloc_alloc): Do not use fast path on wraparound.
+
 2012-09-27  Anthony Green  <green@moxielogic.com>
 
 	* opcode/moxie.h (MOXIE_BAD): New define.
-- 
cgit v1.1