1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ac4eb32df..23e45c84e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-14  Yao Qi  <yao@codesourcery.com>
+
+	Merge from gcc:
+
+	2011-08-14  Yao Qi  <yao@codesourcery.com>
+	* configure.ac (tic6x-*-*): Remove gdb from noconfigdirs.
+	* configure: Regenerate.
+
 2011-07-26  Ian Lance Taylor  <iant@google.com>
 
 	Merge from gcc: