diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/gnu-nat.c | 15 |
2 files changed, 17 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eff2fa2..88db3be 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2020-06-18 Pedro Alves <palves@redhat.com> + * gnu-nat.c (gnu_nat_target::create_inferior): Switch to the added + thread. + (gnu_nat_target::attach): Don't write to inferior_ptid directly. + Instead use switch_to_thread. + (gnu_nat_target::detach): Use switch_to_no_thread + instead of writing to inferior_ptid directly. Used passed-in + inferior instead of looking up the inferior by pid. + +2020-06-18 Pedro Alves <palves@redhat.com> + * go32-nat.c (go32_nat_target::create_inferior): Don't write to inferior_ptid. diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index 44adda5..3cee06d 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -2121,7 +2121,8 @@ gnu_nat_target::create_inferior (const char *exec_file, /* We have something that executes now. We'll be running through the shell at this point (if startup-with-shell is true), but the pid shouldn't change. */ - add_thread_silent (this, ptid_t (pid)); + thread_info *thr = add_thread_silent (this, ptid_t (pid)); + switch_to_thread (thr); /* Attach to the now stopped child, which is actually a shell... */ inf_debug (inf, "attaching to child: %d", pid); @@ -2196,7 +2197,9 @@ gnu_nat_target::attach (const char *args, int from_tty) inf_update_procs (inf); - inferior_ptid = ptid_t (pid, inf_pick_first_thread (), 0); + thread_info *thr + = find_thread_ptid (this, ptid_t (pid, inf_pick_first_thread ())); + switch_to_thread (thr); /* We have to initialize the terminal settings now, since the code below might try to restore them. */ @@ -2225,8 +2228,6 @@ gnu_nat_target::attach (const char *args, int from_tty) void gnu_nat_target::detach (inferior *inf, int from_tty) { - int pid; - if (from_tty) { const char *exec_file = get_exec_file (0); @@ -2238,12 +2239,10 @@ gnu_nat_target::detach (inferior *inf, int from_tty) printf_unfiltered ("Detaching from pid %d\n", gnu_current_inf->pid); } - pid = gnu_current_inf->pid; - inf_detach (gnu_current_inf); - inferior_ptid = null_ptid; - detach_inferior (find_inferior_pid (this, pid)); + switch_to_no_thread (); + detach_inferior (inf); maybe_unpush_target (); } |