[PATCH 05/10] Include netbsd_wait in the netbsd_process_target class

[Kamil Rytarowski]

gdbserver/ChangeLog:

       * netbsd-low.cc (netbsd_wait): Turn into...
       (netbsd_process_target::netbsd_wait): ...this.
       * netbsd-low.h (netbsd_process_target::netbsd_wait): Add.
---
 gdbserver/ChangeLog     |  6 ++++++
 gdbserver/netbsd-low.cc | 12 ++++--------
 gdbserver/netbsd-low.h  |  6 ++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 17f78193be9..f978ac34fcd 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-01  Kamil Rytarowski  <n54@gmx.com>
+
+	* netbsd-low.cc (netbsd_wait): Turn into...
+	(netbsd_process_target::netbsd_wait): ...this.
+	* netbsd-low.h (netbsd_process_target::netbsd_wait): Add.
+
 2020-10-01  Kamil Rytarowski  <n54@gmx.com>

 	* netbsd-low.cc (gdb_catching_syscalls_p): Turn into...
diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc
index bcae3a6f757..c834b5c6f78 100644
--- a/gdbserver/netbsd-low.cc
+++ b/gdbserver/netbsd-low.cc
@@ -241,15 +241,11 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus,
 }


-/* Implement the wait target_ops method.
-
-   Wait for the child specified by PTID to do something.  Return the
-   process ID of the child, or MINUS_ONE_PTID in case of error; store
-   the status in *OURSTATUS.  */
+/* See netbsd-low.h.  */

-static ptid_t
-netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
-	     target_wait_flags target_options)
+ptid_t
+netbsd_process_target::netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
+				    target_wait_flags target_options)
 {
   pid_t pid = netbsd_waitpid (ptid, ourstatus, target_options);
   ptid_t wptid = ptid_t (pid);
diff --git a/gdbserver/netbsd-low.h b/gdbserver/netbsd-low.h
index 6797868dbe7..cb4a3ce44ed 100644
--- a/gdbserver/netbsd-low.h
+++ b/gdbserver/netbsd-low.h
@@ -138,6 +138,12 @@ class netbsd_process_target : public process_stratum_target
   /* Returns true if GDB is interested in any child syscalls.  */
   bool gdb_catching_syscalls_p (pid_t pid);

+  /* Wait for the child specified by PTID to do something.  Return the
+     process ID of the child, or MINUS_ONE_PTID in case of error; store
+     the status in *OURSTATUS.  */
+  ptid_t netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
+		      target_wait_flags target_options);
+
 protected:
   /* The architecture-specific "low" methods are listed below.  */

--
2.28.0