1 files changed, 19 insertions, 12 deletions

diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c
index 1c2daa0..f0acfcf 100644
--- a/gdb/hpux-thread.c
+++ b/gdb/hpux-thread.c
@@ -65,9 +65,6 @@ static ptid_t main_ptid;		/* Real process ID */
 static CORE_ADDR P_cma__g_known_threads;
 static CORE_ADDR P_cma__g_current_thread;
 
-static void hpux_thread_resume (ptid_t ptid, int step,
-                                enum target_signal signo);
-
 static void init_hpux_thread_ops (void);
 
 static struct target_ops hpux_thread_ops;
@@ -171,7 +168,8 @@ hpux_thread_detach (struct target_ops *ops, char *args, int from_tty)
    for procfs.  */
 
 static void
-hpux_thread_resume (ptid_t ptid, int step, enum target_signal signo)
+hpux_thread_resume (struct target_ops *ops,
+		    ptid_t ptid, int step, enum target_signal signo)
 {
   struct cleanup *old_chain;
 
@@ -180,7 +178,7 @@ hpux_thread_resume (ptid_t ptid, int step, enum target_signal signo)
   ptid = main_ptid;
   inferior_ptid = main_ptid;
 
-  deprecated_child_ops.to_resume (ptid, step, signo);
+  deprecated_child_ops.to_resume (&deprecated_child_ops, ptid, step, signo);
 
   cached_thread = 0;
 
@@ -241,7 +239,8 @@ static char regmap[] =
 };
 
 static void
-hpux_thread_fetch_registers (struct regcache *regcache, int regno)
+hpux_thread_fetch_registers (struct target_ops *ops,
+			     struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   cma__t_int_tcb tcb, *tcb_ptr;
@@ -257,7 +256,8 @@ hpux_thread_fetch_registers (struct regcache *regcache, int regno)
 
   if (tcb_ptr->state == cma__c_state_running)
     {
-      deprecated_child_ops.to_fetch_registers (regcache, regno);
+      deprecated_child_ops.to_fetch_registers (&deprecated_child_ops,
+					       regcache, regno);
 
       do_cleanups (old_chain);
 
@@ -278,7 +278,8 @@ hpux_thread_fetch_registers (struct regcache *regcache, int regno)
   for (regno = first_regno; regno <= last_regno; regno++)
     {
       if (regmap[regno] == -1)
-	deprecated_child_ops.to_fetch_registers (regcache, regno);
+	deprecated_child_ops.to_fetch_registers (&deprecated_child_ops,
+						 regcache, regno);
       else
 	{
 	  unsigned char buf[MAX_REGISTER_SIZE];
@@ -305,7 +306,8 @@ hpux_thread_fetch_registers (struct regcache *regcache, int regno)
 }
 
 static void
-hpux_thread_store_registers (struct regcache *regcache, int regno)
+hpux_thread_store_registers (struct target_ops *ops,
+			     struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   cma__t_int_tcb tcb, *tcb_ptr;
@@ -321,7 +323,8 @@ hpux_thread_store_registers (struct regcache *regcache, int regno)
 
   if (tcb_ptr->state == cma__c_state_running)
     {
-      deprecated_child_ops.to_store_registers (regcache, regno);
+      deprecated_child_ops.to_store_registers (&deprecated_child_ops,
+					       regcache, regno);
 
       do_cleanups (old_chain);
 
@@ -351,7 +354,11 @@ hpux_thread_store_registers (struct regcache *regcache, int regno)
 	  sp = (CORE_ADDR) tcb_ptr->static_ctx.sp - 160;
 
 	  if (regno == HPPA_FLAGS_REGNUM)
-	    deprecated_child_ops.to_store_registers (regcache, regno);	/* Let lower layer handle this... */
+	    {
+	      /* Let lower layer handle this... */
+	      deprecated_child_ops.to_store_registers
+		(&deprecated_child_ops, regcache, regno);
+	    }
 	  else if (regno == HPPA_SP_REGNUM)
 	    {
 	      regcache_raw_collect (regcache, regno, buf);
@@ -502,7 +509,7 @@ hpux_thread_can_run (void)
 }
 
 static int
-hpux_thread_alive (ptid_t ptid)
+hpux_thread_alive (struct target_ops *ops, ptid_t ptid)
 {
   return 1;
 }