---- gdb-6.6/gdb/testsuite/gdb.threads/staticthreads.exp-orig 2005-04-30 21:56:47.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/staticthreads.exp 2008-01-11 14:30:15.000000000 +0100
-@@ -44,9 +44,21 @@ gdb_load ${binfile}
- gdb_test "set print sevenbit-strings" ""
-
+Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/staticthreads.exp
+===================================================================
+--- gdb-7.4.50.20111219.orig/gdb/testsuite/gdb.threads/staticthreads.exp 2011-12-19 21:07:01.436475201 +0100
++++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/staticthreads.exp 2011-12-19 22:08:55.444514127 +0100
+@@ -45,6 +45,13 @@ gdb_test_no_output "set print sevenbit-s
+ # See if the static multi-threaded program runs.
-+runto_main
+ runto_main
+
+# See if we get excessive LWP there (patched glibc with unpatched GDB):
+# * 2 Thread 135661664 (LWP 3856) main () at threadloop.c:41
+# 1 process 3856 main () at threadloop.c:41
+
-+set test "info threads on start"
-+gdb_test_multiple "info threads" "$test" {
-+ -re "^info threads\r?\n\[^\r\n\]* Thread \[^\r\n\]*\r?\n$gdb_prompt" {
-+ pass "$test"
-+ }
-+}
++gdb_test "info threads" "^info threads\r\n\[ \t\]*Id\[ \t\]+Target Id\[ \t\]+Frame\[ \t\]*\r\n\[^\r\n\]* Thread \[^\r\n\]*" "info threads on start"
+
- # See if the static multi-threaded program runs.
-
--runto_main
gdb_test "break sem_post"
set test "Continue to main's call of sem_post"
gdb_test_multiple "continue" "$test" {