Remove the global step_multi in favour of a per-thread

	step_multi.

	* inferior.h (step_multi): Delete.
	* gdbthread.h (struct thread_info): Add comments around
	step_multi.
	(save_infrun_state, load_infrun_state): Remove step_multi
	parameter.
	* thread.c (load_infrun_state, save_infrun_state): Remove
	step_multi argument, and references to it.
	* infcmd.c (step_multi): Delete.
	(step_1): Adjust.
	(step_1_continuation, until_next_command): Adjust.
	* infrun.c (fetch_inferior_event): Adjust.
	(context_switch): Don't context-switch step_multi.
	(print_stop_reason, normal_stop): Adjust.

1 files changed, 2 insertions, 6 deletions

diff --git a/gdb/thread.c b/gdb/thread.c
index 33b4795..a3d85f8 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -445,8 +445,7 @@ void
 load_infrun_state (ptid_t ptid,
 		   struct continuation **continuations,
 		   struct continuation **intermediate_continuations,
-		   int *stop_step,
-		   int *step_multi)
+		   int *stop_step)
 {
   struct thread_info *tp;
 
@@ -465,7 +464,6 @@ load_infrun_state (ptid_t ptid,
       *intermediate_continuations = tp->intermediate_continuations;
       tp->intermediate_continuations = NULL;
       *stop_step = tp->stop_step;
-      *step_multi = tp->step_multi;
     }
 }
 
@@ -475,8 +473,7 @@ void
 save_infrun_state (ptid_t ptid,
 		   struct continuation *continuations,
 		   struct continuation *intermediate_continuations,
-		   int stop_step,
-		   int step_multi)
+		   int stop_step)
 {
   struct thread_info *tp;
 
@@ -493,7 +490,6 @@ save_infrun_state (ptid_t ptid,
       tp->continuations = continuations;
       tp->intermediate_continuations = intermediate_continuations;
       tp->stop_step = stop_step;
-      tp->step_multi = step_multi;
     }
 }