gdb: Fix build on several hosts/ports

Commit 00431a78b28f ("Use thread_info and inferior pointers more
throughout") missed updating some callers, like e.g.,:

 gdb/remote-sim.c: In member function 'virtual void gdbsim_target::mourn_inferior()':
 gdb/remote-sim.c:1198:50: error: cannot convert 'ptid_t' to 'thread_info*' for argument '1' to 'void delete_thread_silent(thread_info*)'
   delete_thread_silent (sim_data->remote_sim_ptid);

 gdb/mygit/src/gdb/procfs.c: In member function ‘virtual void procfs_target::detach(inferior*, int)’:
 gdb/mygit/src/gdb/procfs.c:1931:23: error: invalid conversion from ‘int’ to ‘inferior*’ [-fpermissive]
    detach_inferior (pid);
			 ^
 In file included from gdb/mygit/src/gdb/procfs.c:24:0:
 gdb/mygit/src/gdb/inferior.h:476:13: note:   initializing argument 1 of ‘void detach_inferior(inferior*)’

 etc.

This fixes it.

The delete_thread_silent calls in both go32-nat.c and remote-sim.c are
unnecessary because generic_mourn_inferior calls exit_inferior, which
deletes the inferior's threads.

gdb/ChangeLog:
2018-06-25  Pedro Alves  <palves@redhat.com>

	* windows-nat.c (windows_delete_thread): Use find_thread_ptid and
	pass thread_info pointer to delete_thread.
	(windows_nat_target::detach): Pass inferior pointer to
	detach_inferior.
	* aix-thread.c (sync_threadlists): Pass thread_info pointer to
	delete_thread.
	* bsd-kvm.c (bsd_kvm_target::close): Use discard_all_inferiors.
	* darwin-nat.c (darwin_check_new_threads): Use find_thread_ptid
	and pass a thread_info pointer to delete_thread.
	* fbsd-nat.c (fbsd_nat_target::wait): Use find_thread_ptid and
	pass thread_info pointer to delete_thread.
	* go32-nat.c (go32_nat_target::mourn_inferior): Remove
	delete_thread_silent call.
	* procfs.c (procfs_target::detach): Pass inferior pointer to
	detach_inferior.
	(procfs_target::wait): Pass thread_info pointer to delete_thread.
	* remote-sim.c (gdbsim_target::mourn_inferior): Remove
	delete_thread_silent call.
	* windows-nat.c (windows_delete_thread): Use find_thread_ptid and
	pass thread_info pointer to delete_thread.
	(windows_nat_target::detach): Pass inferior pointer to
	delete_inferior.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9539c87ca18f6a7973d3096890c4f6ffa19066bf..4a3f7183a5138a17657c32086d0c032cbf9aa34b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,28 @@
+2018-06-25  Pedro Alves  <palves@redhat.com>
+
+       * windows-nat.c (windows_delete_thread): Use find_thread_ptid and
+       pass thread_info pointer to delete_thread.
+       (windows_nat_target::detach): Pass inferior pointer to
+       detach_inferior.
+       * aix-thread.c (sync_threadlists): Pass thread_info pointer to
+       delete_thread.
+       * bsd-kvm.c (bsd_kvm_target::close): Use discard_all_inferiors.
+       * darwin-nat.c (darwin_check_new_threads): Use find_thread_ptid
+       and pass a thread_info pointer to delete_thread.
+       * fbsd-nat.c (fbsd_nat_target::wait): Use find_thread_ptid and
+       pass thread_info pointer to delete_thread.
+       * go32-nat.c (go32_nat_target::mourn_inferior): Remove
+       delete_thread_silent call.
+       * procfs.c (procfs_target::detach): Pass inferior pointer to
+       detach_inferior.
+       (procfs_target::wait): Pass thread_info pointer to delete_thread.
+       * remote-sim.c (gdbsim_target::mourn_inferior): Remove
+       delete_thread_silent call.
+       * windows-nat.c (windows_delete_thread): Use find_thread_ptid and
+       pass thread_info pointer to delete_thread.
+       (windows_nat_target::detach): Pass inferior pointer to
+       delete_inferior.
+
 2018-06-22  Alan Hayward  <alan.hayward@arm.com>
 
        * regcache.c (readable_regcache::read_part): Fix asserts.

diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 643d3213f0e0c7ca9d169837a0b914f3869b1476..345242aa5716afd06836cb3efb9dce7ec69c5e58 100644 (file)
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -800,7 +800,7 @@ sync_threadlists (void)
     {
       if (pi == pcount)
        {
-         delete_thread (gbuf[gi]->ptid);
+         delete_thread (gbuf[gi]);
          gi++;
        }
       else if (gi == gcount)
@@ -836,7 +836,7 @@ sync_threadlists (void)
            }
          else if (cmp_result > 0)
            {
-             delete_thread (gptid);
+             delete_thread (gbuf[gi]);
              gi++;
            }
          else

diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 336dbf2b976334050d730e753779c74e51ad6f42..434c1928b79c87eb97fca9f3091e31410c04de76 100644 (file)
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -155,7 +155,7 @@ bsd_kvm_target::close ()
     }
 
   inferior_ptid = null_ptid;
-  delete_thread_silent (bsd_kvm_ptid);
+  discard_all_inferiors ();
 }
 
 static LONGEST

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index ed1ed32898996c5c2a833aa9b60ade675022c269..7dccce7392674aefa5ead321266f20aa37ed85f9 100644 (file)
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -350,7 +350,9 @@ darwin_check_new_threads (struct inferior *inf)
       if (old_ix < old_nbr && (new_ix == new_nbr || new_id > old_id))
        {
          /* A thread was removed.  */
-         delete_thread (ptid_build (inf->pid, 0, old_id));
+         struct thread_info *thr
+           = find_thread_ptid (ptid_build (inf->pid, 0, old_id));
+         delete_thread (thr);
          kret = mach_port_deallocate (gdb_task, old_id);
          MACH_CHECK_ERROR (kret);
          old_ix++;

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 069e1e44bee7694f4f614fd5857fc8304aad3a49..f9c622cf1389526be0db1ddac49de8fc46b45a2f 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -1274,7 +1274,8 @@ fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
                 threads might be skipped during post_attach that
                 have not yet reported their PL_FLAG_EXITED event.
                 Ignore EXITED events for an unknown LWP.  */
-             if (in_thread_list (wptid))
+             thread_info *thr = find_thread_ptid (wptid);
+             if (thr != nullptr)
                {
                  if (debug_fbsd_lwp)
                    fprintf_unfiltered (gdb_stdlog,
@@ -1283,7 +1284,7 @@ fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
                  if (print_thread_events)
                    printf_unfiltered (_("[%s exited]\n"), target_pid_to_str
                                       (wptid));
-                 delete_thread (wptid);
+                 delete_thread (thr);
                }
              if (ptrace (PT_CONTINUE, pid, (caddr_t) 1, 0) == -1)
                perror_with_name (("ptrace"));

diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index f00e424d464246d1cf41e48862935d23bee5ee03..687fd295fb7f7673ab0ed39606d5d0d7bc393b55 100644 (file)
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -788,7 +788,6 @@ go32_nat_target::mourn_inferior ()
 
   ptid = inferior_ptid;
   inferior_ptid = null_ptid;
-  delete_thread_silent (ptid);
   prog_has_started = 0;
 
   generic_mourn_inferior ();

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 8b09eca6ed9abebad37bba1d50e43668cd7f3e14..ab959b785428e93639ea2d50585654153fe9895c 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1928,7 +1928,7 @@ procfs_target::detach (inferior *inf, int from_tty)
   do_detach ();
 
   inferior_ptid = null_ptid;
-  detach_inferior (pid);
+  detach_inferior (inf);
   maybe_unpush_target ();
 }
 
@@ -2295,7 +2295,7 @@ wait_again:
                    if (print_thread_events)
                      printf_unfiltered (_("[%s exited]\n"),
                                         target_pid_to_str (retval));
-                   delete_thread (retval);
+                   delete_thread (find_thread_ptid (retval));
                    status->kind = TARGET_WAITKIND_SPURIOUS;
                    return retval;
                  }
@@ -2414,7 +2414,7 @@ wait_again:
                    if (print_thread_events)
                      printf_unfiltered (_("[%s exited]\n"),
                                         target_pid_to_str (retval));
-                   delete_thread (retval);
+                   delete_thread (find_thread_ptid (retval));
                    status->kind = TARGET_WAITKIND_SPURIOUS;
                    return retval;
                  }

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 9c89ab9db729d66be699e548d66beedd17855ab0..29bfe1dc7e163d42312904db661ccf2e796725b4 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1195,7 +1195,6 @@ gdbsim_target::mourn_inferior ()
 
   remove_breakpoints ();
   generic_mourn_inferior ();
-  delete_thread_silent (sim_data->remote_sim_ptid);
 }
 
 /* Pass the command argument through to the simulator verbatim.  The

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 63a780014abdfb922c7fa0a70d4feb32dd494488..98d94a33f25e628fb7f0e5478eb4f61cd94a01a7 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -493,7 +493,7 @@ windows_delete_thread (ptid_t ptid, DWORD exit_code)
   else if (print_thread_events && id != main_thread_id)
     printf_unfiltered (_("[%s exited with code %u]\n"),
                       target_pid_to_str (ptid), (unsigned) exit_code);
-  delete_thread (ptid);
+  delete_thread (find_thread_ptid (ptid));
 
   for (th = &thread_head;
        th->next != NULL && th->next->id != id;
@@ -2000,7 +2000,7 @@ windows_nat_target::detach (inferior *inf, int from_tty)
 
   x86_cleanup_dregs ();
   inferior_ptid = null_ptid;
-  detach_inferior (current_event.dwProcessId);
+  detach_inferior (inf);
 
   maybe_unpush_target ();
 }