From c6d1029f18f38a215028c8eeda28ca1a2c9206c7 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 31 Oct 2004 20:47:55 +0000
Subject: [PATCH] * mipsnbsd-nat.c: Include "target.h" and "inf-ptrace.h".
 (mipsnbsd_fetch_inferior_registers): Rename from fetch_inferior_registers. 
 Make static. (mipsnbsd_store_inferior_registers): Rename from
 store_inferior_registers.  Make static. (_initialize_mipsnbsd_nat): New
 function and prototype. * Makefile.in (mipsnbsd-nat.o): Update dependencies.
 * config/mips/nbsd.mh (NAT_CLIBS, NAT_FILE): Remove variables. (NATDEPFILES):
 Remove infptrace.o and inftarg.o.  Add inf-ptrace.o.

---
 gdb/ChangeLog           | 13 +++++++++++++
 gdb/Makefile.in         |  2 +-
 gdb/config/mips/nbsd.mh |  6 ++----
 gdb/mipsnbsd-nat.c      | 31 ++++++++++++++++++++++++-------
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8aa4d4f6b2e..4432e4879a8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2004-10-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* mipsnbsd-nat.c: Include "target.h" and "inf-ptrace.h".
+	(mipsnbsd_fetch_inferior_registers): Rename from
+	fetch_inferior_registers.  Make static.
+	(mipsnbsd_store_inferior_registers): Rename from
+	store_inferior_registers.  Make static.
+	(_initialize_mipsnbsd_nat): New function and prototype.
+	* Makefile.in (mipsnbsd-nat.o): Update dependencies.
+	* config/mips/nbsd.mh (NAT_CLIBS, NAT_FILE): Remove variables.
+	(NATDEPFILES): Remove infptrace.o and inftarg.o.  Add
+	inf-ptrace.o.
+
 2004-10-31  Andrew Cagney  <cagney@gnu.org>
 
 	* xstormy16-tdep.c (xstormy16_in_solib_call_trampoline)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6e1fc7dc83e..356260c4310 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2245,7 +2245,7 @@ mips-mdebug-tdep.o: mips-mdebug-tdep.c $(defs_h) $(frame_h) $(mips_tdep_h) \
 	$(elf_bfd_h) $(gdb_assert_h) $(frame_unwind_h) $(frame_base_h) \
 	$(mips_mdebug_tdep_h) $(mdebugread_h)
 mipsnbsd-nat.o: mipsnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(mips_tdep_h) $(mipsnbsd_tdep_h)
+	$(target_h) $(mips_tdep_h) $(mipsnbsd_tdep_h) $(inf_ptrace_h)
 mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(regset_h) $(target_h) $(value_h) $(osabi_h) $(gdb_assert_h) \
 	$(gdb_string_h) $(nbsd_tdep_h) $(mipsnbsd_tdep_h) $(mips_tdep_h) \
diff --git a/gdb/config/mips/nbsd.mh b/gdb/config/mips/nbsd.mh
index 5209d29bf39..b76df132b15 100644
--- a/gdb/config/mips/nbsd.mh
+++ b/gdb/config/mips/nbsd.mh
@@ -1,4 +1,2 @@
-# Host: MIPS running NetBSD
-NAT_CLIBS=
-NATDEPFILES= infptrace.o inftarg.o fork-child.o mipsnbsd-nat.o
-NAT_FILE= config/nm-nbsd.h
+# Host: NetBSD/mips
+NATDEPFILES= fork-child.o inf-ptrace.o mipsnbsd-nat.o
diff --git a/gdb/mipsnbsd-nat.c b/gdb/mipsnbsd-nat.c
index 175e6bedcea..c952bb01805 100644
--- a/gdb/mipsnbsd-nat.c
+++ b/gdb/mipsnbsd-nat.c
@@ -22,14 +22,16 @@
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
-
-#include "mips-tdep.h"
-#include "mipsnbsd-tdep.h"
+#include "target.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
+#include "mips-tdep.h"
+#include "mipsnbsd-tdep.h"
+#include "inf-ptrace.h"
+
 /* Determine if PT_GETREGS fetches this register.  */
 static int
 getregs_supplies (int regno)
@@ -37,8 +39,8 @@ getregs_supplies (int regno)
   return ((regno) >= MIPS_ZERO_REGNUM && (regno) <= PC_REGNUM);
 }
 
-void
-fetch_inferior_registers (int regno)
+static void
+mipsnbsd_fetch_inferior_registers (int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
@@ -65,8 +67,8 @@ fetch_inferior_registers (int regno)
     }
 }
 
-void
-store_inferior_registers (int regno)
+static void
+mipsnbsd_store_inferior_registers (int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
@@ -101,3 +103,18 @@ store_inferior_registers (int regno)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_mipsnbsd_nat (void);
+
+void
+_initialize_mipsnbsd_nat (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = mipsnbsd_fetch_inferior_registers;
+  t->to_store_registers = mipsnbsd_store_inferior_registers;
+  add_target (t);
+}
-- 
2.30.2