diff --git a/ChangeLog b/ChangeLog
index 7ac4eb32d..23e45c84e 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:
diff --git a/configure b/configure
index 5366d713e..eb69f28d5 100755
--- a/configure
+++ b/configure
@@ -3584,7 +3584,7 @@ case "${target}" in
     fi
     ;;
   tic6x-*-*)
-    noconfigdirs="$noconfigdirs gdb sim"
+    noconfigdirs="$noconfigdirs sim"
     ;;
   tilepro-*-* | tilegx-*-*)
     noconfigdirs="$noconfigdirs sim"
diff --git a/configure.ac b/configure.ac
index 4cf116073..337e11d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1020,7 +1020,7 @@ case "${target}" in
     fi
     ;;
   tic6x-*-*)
-    noconfigdirs="$noconfigdirs gdb sim"
+    noconfigdirs="$noconfigdirs sim"
     ;;
   tilepro-*-* | tilegx-*-*)
     noconfigdirs="$noconfigdirs sim"