* alphabsd-nat.c: Update copyright year. Include "inf-ptrace.h".

(alphabsd_fetch_inferior_registers): Rename from
fetch_inferior_registers.  Make static.
(alphabsd_store_inferior_registers): Rename from
store_inferior_registers.  Make static.
(_initialize_alphabsd_nat): New function.
* Makefile.in (alphabsd-nat.o): Update dependencies.
* config/alpha/fbsd.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o.  Add inf-ptrace.o, fbsd-nat.o and gcore.o.
* config/alpha/nbsd.mh (NAT_CLIBS): Remove variable.
(NATDEPFILES): Remove infptrace.o and inftarg.o.  Add
alphabsd-nat.o.
* config/alpha/nm-fbsd.h: Update copyright year.  Don't include
"config/nm-bsd.h" and "elf/common.h".
* config/alpha/nm-nbsd.h: Update copyright year.  Don't include
"config/nm-nbsd.h".

4 files changed, 15 insertions, 20 deletions

diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
index 7e036e43a4..a30dd454f8 100644
--- a/gdb/config/alpha/fbsd.mh
+++ b/gdb/config/alpha/fbsd.mh
@@ -1,5 +1,6 @@
-# Host: FreeBSD/Alpha
-NATDEPFILES= fork-child.o infptrace.o inftarg.o \
-	solib.o solib-svr4.o solib-legacy.o \
-	corelow.o core-regset.o alphabsd-nat.o
+# Host: FreeBSD/alpha
+NATDEPFILES= fork-child.o inf-ptrace.o \
+	fbsd-nat.o alphabsd-nat.o \
+	gcore.o solib.o solib-svr4.o solib-legacy.o \
+	corelow.o core-regset.o
 NAT_FILE= nm-fbsd.h
diff --git a/gdb/config/alpha/nbsd.mh b/gdb/config/alpha/nbsd.mh
index 52754a3065..84c390bdc6 100644
--- a/gdb/config/alpha/nbsd.mh
+++ b/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
diff --git a/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h
index 5eec1853f3..5cc2fefa28 100644
--- a/gdb/config/alpha/nm-fbsd.h
+++ b/gdb/config/alpha/nm-fbsd.h
@@ -1,6 +1,6 @@
-/* Native-dependent definitions for FreeBSD/Alpha.
+/* Native-dependent definitions for FreeBSD/alpha.
 
-   Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004
+   Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -23,9 +23,6 @@
 #ifndef NM_FBSD_H
 #define NM_FBSD_H
 
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
 /* The Alpha does not step over a breakpoint.  */
 #define CANNOT_STEP_BREAKPOINT 1
 
@@ -33,6 +30,5 @@
 /* Shared library support.  */
 
 #include "solib.h"		/* Support for shared libraries. */
-#include "elf/common.h"		/* Additional ELF shared library info. */
 
-#endif /* NM_FBSD_H */
+#endif /* nm-fbsd.h */
diff --git a/gdb/config/alpha/nm-nbsd.h b/gdb/config/alpha/nm-nbsd.h
index 10fab6ec3b..ff69de99aa 100644
--- a/gdb/config/alpha/nm-nbsd.h
+++ b/gdb/config/alpha/nm-nbsd.h
@@ -1,5 +1,7 @@
-/* Native-dependent definitions for Alpha running NetBSD, for GDB.
-   Copyright 2002 Free Software Foundation, Inc.
+/* Native-dependent definitions for NetBSD/alpha.
+
+   Copyright 2002, 2005 Free Software Foundation, Inc.
+
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
@@ -22,10 +24,7 @@
 #ifndef NM_NBSD_H
 #define NM_NBSD_H
 
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
 /* The Alpha does not step over a breakpoint.  */
 #define CANNOT_STEP_BREAKPOINT 1
 
-#endif /* NM_NBSD_H */
+#endif /* nm-nbsd.h */