* m88kbsd-nat.c: Include "target.h" and "inf-ptrace.h".

(m88kbsd_fetch_inferior_registers): Rename from
fetch_inferior_registers.  Make static.
(m88kbsd_store_inferior_registers): Rename from
store_inferior_registers.  Make static.
(_initialize_m88kbsd_nat): New prototype and function.
* config/m88k/obsd.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o.  Add inf-child.o and inf-ptrace.o.
(NAT_FILE): Remove.
* Makefile.in (m88kbsd-nat.o): Update dependencies.

4 files changed, 36 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index db59bb4..165e158 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-30  Mark Kettenis  <kettenis@gnu.org>
+
+	* m88kbsd-nat.c: Include "target.h" and "inf-ptrace.h".
+	(m88kbsd_fetch_inferior_registers): Rename from
+	fetch_inferior_registers.  Make static.
+	(m88kbsd_store_inferior_registers): Rename from
+	store_inferior_registers.  Make static.
+	(_initialize_m88kbsd_nat): New prototype and function.
+	* config/m88k/obsd.mh (NATDEPFILES): Remove infptrace.o and
+	inftarg.o.  Add inf-child.o and inf-ptrace.o.
+	(NAT_FILE): Remove.
+	* Makefile.in (m88kbsd-nat.o): Update dependencies.
+
 2004-09-30  Andrew Cagney  <cagney@gnu.org>
 
 	* target.c (target_xfer_partial): New function.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 404f80c..7cdfafa 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2166,7 +2166,7 @@ m68k-tdep.o: m68k-tdep.c $(defs_h) $(dwarf2_frame_h) $(frame_h) \
 	$(inferior_h) $(regcache_h) $(arch_utils_h) $(osabi_h) $(dis_asm_h) \
 	$(m68k_tdep_h) $(gregset_h)
 m88kbsd-nat.o: m88kbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(m88k_tdep_h)
+	$(target_h) $(m88k_tdep_h) $(inf_ptrace.h)
 m88k-tdep.o: m88k-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) $(frame_h) \
 	$(frame_base_h) $(frame_unwind_h) $(gdbcore_h) $(gdbtypes_h) \
 	$(regcache_h) $(regset_h) $(symtab_h) $(trad_frame_h) $(value_h) \
diff --git a/gdb/config/m88k/obsd.mh b/gdb/config/m88k/obsd.mh
index e9281bc..8cd61e5 100644
--- a/gdb/config/m88k/obsd.mh
+++ b/gdb/config/m88k/obsd.mh
@@ -1,3 +1,2 @@
 # Host: OpenBSD/m88k
-NATDEPFILES= m88kbsd-nat.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= config/nm-bsd.h
+NATDEPFILES= fork-child.o inf-child.o inf-ptrace.o m88kbsd-nat.o
diff --git a/gdb/m88kbsd-nat.c b/gdb/m88kbsd-nat.c
index 7553c19..472eb76 100644
--- a/gdb/m88kbsd-nat.c
+++ b/gdb/m88kbsd-nat.c
@@ -22,12 +22,14 @@
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
+#include "target.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
 #include "m88k-tdep.h"
+#include "inf-ptrace.h"
 
 /* Supply the general-purpose registers stored in GREGS to REGCACHE.  */
 
@@ -62,8 +64,8 @@ m88kbsd_collect_gregset (const struct regcache *regcache,
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers.  */
 
-void
-fetch_inferior_registers (int regnum)
+static void
+m88kbsd_fetch_inferior_registers (int regnum)
 {
   struct reg regs;
 
@@ -77,8 +79,8 @@ fetch_inferior_registers (int regnum)
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers.  */
 
-void
-store_inferior_registers (int regnum)
+static void
+m88kbsd_store_inferior_registers (int regnum)
 {
   struct reg regs;
 
@@ -92,3 +94,18 @@ store_inferior_registers (int regnum)
 	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't write registers");
 }
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_m88kbsd_nat (void);
+
+void
+_initialize_m88kbsd_nat (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = m88kbsd_fetch_inferior_registers;
+  t->to_store_registers = m88kbsd_store_inferior_registers;
+  add_target (t);
+}