From 57cd0b542e1ea81327fcaffab7225c377fb0a4cc Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 17 Apr 2005 22:20:20 +0000
Subject: [PATCH] * hppabsd-nat.c: Update copyright year.  Include "target.h"
 and "inf-ptrace.h". (hppabsd_fetch_registers): Renamed from
 fetch_inferior_registers; made static. (hppabsd_store_registers): Renamed
 from store_inferior_registers; made static. (_initialize_hppabsd_nat): New
 function and prototype. * config/pa/obsd.mh (NATDEPFILES): Remove infptrace.o
 and inftarg.o.  Add inf-ptrace.o. (NAT_FILE): Remove. * Makefile.in
 (hppabsd-nat.o): Update dependencies.

---
 gdb/ChangeLog         | 14 ++++++++++++++
 gdb/Makefile.in       |  2 +-
 gdb/config/pa/obsd.mh |  3 +--
 gdb/hppabsd-nat.c     | 27 ++++++++++++++++++++++-----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9cf7a99..c5cd75a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* hppabsd-nat.c: Update copyright year.  Include "target.h" and
+	"inf-ptrace.h".
+	(hppabsd_fetch_registers): Renamed from fetch_inferior_registers;
+	made static.
+	(hppabsd_store_registers): Renamed from store_inferior_registers;
+	made static.
+	(_initialize_hppabsd_nat): New function and prototype.
+	* config/pa/obsd.mh (NATDEPFILES): Remove infptrace.o and
+	inftarg.o.  Add inf-ptrace.o.
+	(NAT_FILE): Remove.
+	* Makefile.in (hppabsd-nat.o): Update dependencies.
+
 2005-04-17  Mark Kettenis  <kettenis@gnu.org>
 
 	* pa64solib.c, pa64solib.h: Remove files.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8308cbc..0bc7c87 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1994,7 +1994,7 @@ go32-nat.o: go32-nat.c $(defs_h) $(inferior_h) $(gdb_wait_h) $(gdbcore_h) \
 hpacc-abi.o: hpacc-abi.c $(defs_h) $(value_h) $(gdb_regex_h) $(gdb_string_h) \
 	$(gdbtypes_h) $(gdbcore_h) $(cp_abi_h) $(gnu_v2_abi_h)
 hppabsd-nat.o: hppabsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(hppa_tdep_h)
+	$(target_h) $(hppa_tdep_h) $(inf_ptrace_h)
 hppabsd-tdep.o: hppabsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
 	$(regcache_h) $(regset_h) $(gdb_assert_h) $(gdb_string_h) \
 	$(hppa_tdep_h) $(solib_svr4_h)
diff --git a/gdb/config/pa/obsd.mh b/gdb/config/pa/obsd.mh
index 2c3dba9..4e76832 100644
--- a/gdb/config/pa/obsd.mh
+++ b/gdb/config/pa/obsd.mh
@@ -1,3 +1,2 @@
 # Host: OpenBSD/hppa
-NATDEPFILES= fork-child.o infptrace.o inftarg.o hppabsd-nat.o
-NAT_FILE= config/nm-bsd.h
+NATDEPFILES= fork-child.o inf-ptrace.o hppabsd-nat.o
diff --git a/gdb/hppabsd-nat.c b/gdb/hppabsd-nat.c
index a7a85e5..98293a0 100644
--- a/gdb/hppabsd-nat.c
+++ b/gdb/hppabsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for HP PA-RISC BSD's.
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -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 "hppa-tdep.h"
+#include "inf-ptrace.h"
 
 static int
 hppabsd_gregset_supplies_p (int regnum)
@@ -79,8 +81,8 @@ hppabsd_collect_gregset (const struct regcache *regcache,
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating-point registers).  */
 
-void
-fetch_inferior_registers (int regnum)
+static void
+hppabsd_fetch_registers (int regnum)
 {
   struct regcache *regcache = current_regcache;
 
@@ -99,8 +101,8 @@ fetch_inferior_registers (int regnum)
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating-point registers).  */
 
-void
-store_inferior_registers (int regnum)
+static void
+hppabsd_store_registers (int regnum)
 {
   if (regnum == -1 || hppabsd_gregset_supplies_p (regnum))
     {
@@ -117,3 +119,18 @@ store_inferior_registers (int regnum)
         perror_with_name (_("Couldn't write registers"));
     }
 }
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_hppabsd_nat (void);
+
+void
+_initialize_hppabsd_nat (void)
+{
+  struct target_ops *t;
+
+  /* Add in local overrides.  */
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = hppabsd_fetch_registers;
+  t->to_store_registers = hppabsd_store_registers;
+  add_target (t);
+}
-- 
2.7.4