Cut alpha over to inf-ptrace.c, making fork following work.

tested by miod@

2 files changed, 36 insertions, 22 deletions

diff --git a/gnu/usr.bin/binutils/gdb/alphabsd-nat.c b/gnu/usr.bin/binutils/gdb/alphabsd-nat.c
index 0781698710f..5792ecc5344 100644
--- a/gnu/usr.bin/binutils/gdb/alphabsd-nat.c
+++ b/gnu/usr.bin/binutils/gdb/alphabsd-nat.c
@@ -1,5 +1,6 @@
 /* Native-dependent code for Alpha BSD's.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,6 +25,7 @@
 
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
+#include "inf-ptrace.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
@@ -76,23 +78,22 @@ static int
 getregs_supplies (int regno)
 {
   return ((regno >= ALPHA_V0_REGNUM && regno <= ALPHA_ZERO_REGNUM)
-	  || regno >= PC_REGNUM);
+	  || regno >= ALPHA_PC_REGNUM);
 }
 
-
 /* Fetch register REGNO from the inferior.  If REGNO is -1, do this
    for all registers (including the floating point registers).  */
 
-void
-fetch_inferior_registers (int regno)
+static void
+alphabsd_fetch_inferior_registers (int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
       struct reg gregs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
-	perror_with_name ("Couldn't get registers");
+		  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
+	perror_with_name (_("Couldn't get registers"));
 
       alphabsd_supply_reg ((char *) &gregs, regno);
       if (regno != -1)
@@ -104,8 +105,8 @@ fetch_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
-	perror_with_name ("Couldn't get floating point status");
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't get floating point status"));
 
       alphabsd_supply_fpreg ((char *) &fpregs, regno);
     }
@@ -114,21 +115,21 @@ fetch_inferior_registers (int regno)
 /* Store register REGNO back into the inferior.  If REGNO is -1, do
    this for all registers (including the floating point registers).  */
 
-void
-store_inferior_registers (int regno)
+static void
+alphabsd_store_inferior_registers (int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
       struct reg gregs;
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
-        perror_with_name ("Couldn't get registers");
+                  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
+        perror_with_name (_("Couldn't get registers"));
 
       alphabsd_fill_reg ((char *) &gregs, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
-        perror_with_name ("Couldn't write registers");
+                  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
+        perror_with_name (_("Couldn't write registers"));
 
       if (regno != -1)
 	return;
@@ -139,13 +140,27 @@ store_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
-	perror_with_name ("Couldn't get floating point status");
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't get floating point status"));
 
       alphabsd_fill_fpreg ((char *) &fpregs, regno);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
-	perror_with_name ("Couldn't write floating point status");
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't write floating point status"));
     }
 }
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_alphabsd_nat (void);
+
+void
+_initialize_alphabsd_nat (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = alphabsd_fetch_inferior_registers;
+  t->to_store_registers = alphabsd_store_inferior_registers;
+  add_target (t);
+}
diff --git a/gnu/usr.bin/binutils/gdb/config/alpha/nbsd.mh b/gnu/usr.bin/binutils/gdb/config/alpha/nbsd.mh
index 52754a3065d..84c390bdc62 100644
--- a/gnu/usr.bin/binutils/gdb/config/alpha/nbsd.mh
+++ b/gnu/usr.bin/binutils/gdb/config/alpha/nbsd.mh
@@ -1,4 +1,3 @@
-# Host: Alpha running NetBSD
-NAT_CLIBS=
-NATDEPFILES= infptrace.o inftarg.o fork-child.o alphabsd-nat.o
+# Host: NetBSD/alpha
+NATDEPFILES= fork-child.o inf-ptrace.o alphabsd-nat.o
 NAT_FILE= nm-nbsd.h