Index: gdb-7.7.50.20140609/gdb/infrun.c

===================================================================

--- gdb-7.7.50.20140609.orig/gdb/infrun.c	2014-06-13 20:08:51.225699203 +0200

+++ gdb-7.7.50.20140609/gdb/infrun.c	2014-06-13 20:08:55.515703466 +0200

@@ -1661,7 +1661,7 @@ static const char *const scheduler_enums

   schedlock_step,

   NULL

 };

-static const char *scheduler_mode = schedlock_off;

+static const char *scheduler_mode = schedlock_step;

 static void

 show_scheduler_mode (struct ui_file *file, int from_tty,

 		     struct cmd_list_element *c, const char *value)

Index: gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-cli.exp

===================================================================

--- gdb-7.7.50.20140609.orig/gdb/testsuite/gdb.mi/mi-cli.exp	2014-06-13 20:08:55.515703466 +0200

+++ gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-cli.exp	2014-06-13 20:09:24.862732832 +0200

@@ -181,7 +181,7 @@ mi_expect_stop "breakpoint-hit" "main" "

 # Test that the token is output even for CLI commands

 # Also test that *stopped includes frame information.

 mi_gdb_test "34 next" \

-    ".*34\\\^running.*\\*running,thread-id=\"all\"" \

+    ".*34\\\^running.*\\*running,thread-id=\"1\"" \

     "34 next: run"

 # Test that the new current source line is output to the console

Index: gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-logging.exp

===================================================================

--- gdb-7.7.50.20140609.orig/gdb/testsuite/gdb.mi/mi-logging.exp	2014-06-13 20:08:51.227699205 +0200

+++ gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-logging.exp	2014-06-13 20:08:55.516703467 +0200

@@ -53,7 +53,7 @@ close $chan

 set mi_log_prompt "\[(\]gdb\[)\] \[\r\n\]+"

-if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {

+if [regexp "\\^done\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {

     pass "Log file contents"

 } else {

     fail "Log file contents"

@@ -76,7 +76,7 @@ set chan [open $milogfile]

 set logcontent [read $chan]

 close $chan

-if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"all\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {

+if [regexp "1001\\^done\[\r\n\]+$mi_log_prompt.*1002\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt.*1003\\^running\[\r\n\]+\\*running,thread-id=\"1\"\[\r\n\]+$mi_log_prompt\\*stopped,reason=\"end-stepping-range\",.*\[\r\n\]+$mi_log_prompt" $logcontent] {

     pass "Redirect log file contents"

 } else {

     fail "Redirect log file contents"

Index: gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-console.exp

===================================================================

--- gdb-7.7.50.20140609.orig/gdb/testsuite/gdb.mi/mi-console.exp	2014-06-13 20:08:51.227699205 +0200

+++ gdb-7.7.50.20140609/gdb/testsuite/gdb.mi/mi-console.exp	2014-06-13 20:08:55.516703467 +0200

@@ -60,6 +60,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/

 mi_run_to_main

+# thread-id=\"all\" vs. thread-id=\"1\" below:

+mi_gdb_test "210-gdb-set scheduler-locking off" "210\\^done" "set scheduler-locking off"

+

 # The output we get from the target depends on how it is hosted.  If

 # we are semihosted (e.g., the sim or a remote target that supports

 # the File I/O remote protocol extension), we see the target I/O