diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eab307b129..5e1ce3ce25 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-01  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/ending-run.exp: Match __uClibc_main for uClibc.
+
 2010-05-31  Keith Seitz  <keiths@redhat.com>
 
 	PR c++/12750
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 9d1134de7e..0098f04627 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -195,6 +195,10 @@ gdb_test_multiple "next" "step out of main" {
     -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
         pass "step out of main"
     }
+    -re ".*in.*__uClibc_main.*$gdb_prompt $" {
+	# This is what happens on system using uClibc.
+	pass "step out of main"
+    }
 }
 
 # When we're talking to a program running on a real stand-alone board,