diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3b71f145dd..9222124727 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-24  Yao Qi  <yao@codesourcery.com>
+
+	* lib/gdb.exp (can_single_step_to_signal_handler): Return 0 when
+	target is tic6x-*-*.
+
 2011-10-21  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/mi_task_info/task_switch.adb: New file.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 49a4c7efbe..f1900ef76e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1538,7 +1538,8 @@ proc can_single_step_to_signal_handler {} {
     # a signal is delivered during software single step, gdb is unable
     # to determine the next instruction addresses, because start of signal
     # handler is one of them.
-    if { [istarget "arm*-*-*"] || [istarget "mips*-*-*"] } {
+    if { [istarget "arm*-*-*"] || [istarget "mips*-*-*"]
+	 || [istarget "tic6x-*-*"] } {
 	return 0
     }