* armnbsd-nat.c: Include "gdb_string.h" and "inf_ptrace.h".

Reorder includes.  Don't require FETCH_INFERIOR_REGISTERS to be
defined.
(armnbsd_fetch_registers): Rename from armnbsd_fetch_registers.
Make static.
(armnbsd_store_registers): Rename from armnbsd_store_registers.
Make static.
(_initialize_arm_netbsd_nat): Construct and add target vector.
* Makefile.in (armnbsd-nat.o): Update dependencies.
* config/arm/nbsdaout.mh (NATDEPFILES): Remove infptrace.o and
intarg.o, add inf-ptrace.o.
(NAT_FILE): Set to solib.h.
* config/arm/nbsdelf.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o, add inf-ptrace.o.
(NAT_FILE): Remove.

1 files changed, 19 insertions, 13 deletions

diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index 1e5997bdb7e..947a1770b84 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -21,20 +21,19 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "gdbcore.h"
+#include "inferior.h"
+#include "regcache.h"
+#include "target.h"
 
-#ifndef FETCH_INFERIOR_REGISTERS
-#error Not FETCH_INFERIOR_REGISTERS 
-#endif /* !FETCH_INFERIOR_REGISTERS */
-
-#include "arm-tdep.h"
-
+#include "gdb_string.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
-#include "inferior.h"
-#include "regcache.h"
-#include "gdbcore.h"
+
+#include "arm-tdep.h"
+#include "inf-ptrace.h"
 
 extern int arm_apcs_32;
 
@@ -194,8 +193,8 @@ fetch_fp_regs (void)
   supply_fparegset (&inferior_fp_registers);
 }
 
-void
-fetch_inferior_registers (int regno)
+static void
+armnbsd_fetch_registers (int regno)
 {
   if (regno >= 0)
     {
@@ -391,8 +390,8 @@ store_fp_regs (void)
     warning (_("unable to store floating-point registers"));
 }
 
-void
-store_inferior_registers (int regno)
+static void
+armnbsd_store_registers (int regno)
 {
   if (regno >= 0)
     {
@@ -486,6 +485,13 @@ static struct core_fns arm_netbsd_elfcore_fns =
 void
 _initialize_arm_netbsd_nat (void)
 {
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = armnbsd_fetch_registers;
+  t->to_store_registers = armnbsd_store_registers;
+  add_target (t);
+
   deprecated_add_core_fns (&arm_netbsd_core_fns);
   deprecated_add_core_fns (&arm_netbsd_elfcore_fns);
 }