* alphanbsd-tdep.c: Include "gdb_string.h".

* armnbsd-tdep.c: Update copyright year.
Include "gdb_string.h".
* Makefile.in (alphanbsd-tdep.o, armnbsd-tdep.o): Update
dependencies.

4 files changed, 16 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a5e77c5..285f9da 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2004-05-08  Mark Kettenis  <kettenis@gnu.org>
 
+	* alphanbsd-tdep.c: Include "gdb_string.h".
+	* armnbsd-tdep.c: Update copyright year.
+	Include "gdb_string.h".
+	* Makefile.in (alphanbsd-tdep.o, armnbsd-tdep.o): Update
+	dependencies.
+
 	* delta68-nat.c: Remove file.
 	* m68k-tdep.c (delta68_in_sigtramp, delta68_frame_args_address)
 	(delta68_frame_saved_pc, delta68_frame_num_args): Remove functions.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7ea6b7a..84d20d4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1520,8 +1520,8 @@ alpha-mdebug-tdep.o: alpha-mdebug-tdep.c $(defs_h) $(frame_h) \
 alpha-nat.o: alpha-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \
 	$(gdbcore_h) $(target_h) $(regcache_h) $(alpha_tdep_h) $(gregset_h)
 alphanbsd-tdep.o: alphanbsd-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \
-	$(regcache_h) $(value_h) $(osabi_h) $(solib_svr4_h) $(alpha_tdep_h) \
-	$(alphabsd_tdep_h) $(nbsd_tdep_h)
+	$(regcache_h) $(value_h) $(osabi_h) $(gdb_string_h) $(alpha_tdep_h) \
+	$(alphabsd_tdep_h) $(nbsd_tdep_h) $(solib_svr4_h)
 alpha-osf1-tdep.o: alpha-osf1-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 	$(value_h) $(osabi_h) $(gdb_string_h) $(objfiles_h) $(alpha_tdep_h)
 alpha-tdep.o: alpha-tdep.c $(defs_h) $(doublest_h) $(frame_h) \
@@ -1576,8 +1576,8 @@ arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \
 	$(glibc_tdep_h)
 armnbsd-nat.o: armnbsd-nat.c $(defs_h) $(arm_tdep_h) $(inferior_h) \
 	$(regcache_h) $(gdbcore_h)
-armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(osabi_h) $(arm_tdep_h) \
-	$(nbsd_tdep_h) $(solib_svr4_h)
+armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \
+	$(arm_tdep_h) $(nbsd_tdep_h) $(solib_svr4_h)
 arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \
 	$(doublest_h) $(value_h) $(arch_utils_h) $(osabi_h) \
diff --git a/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c
index c8a441b..ed57f39 100644
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alphanbsd-tdep.c
@@ -27,11 +27,12 @@
 #include "value.h"
 #include "osabi.h"
 
-#include "solib-svr4.h"
+#include "gdb-string.h"
 
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
 #include "nbsd-tdep.h"
+#include "solib-svr4.h"
 
 static void
 fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
@@ -225,8 +226,6 @@ _initialize_alphanbsd_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_NETBSD_ELF,
                           alphanbsd_init_abi);
-  gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_OPENBSD_ELF,
-                          alphanbsd_init_abi);
 
   deprecated_add_core_fns (&alphanbsd_core_fns);
   deprecated_add_core_fns (&alphanbsd_elfcore_fns);
diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c
index 0ce46e6..38edf9f 100644
--- a/gdb/armnbsd-tdep.c
+++ b/gdb/armnbsd-tdep.c
@@ -1,5 +1,6 @@
 /* Target-specific functions for ARM running under NetBSD.
-   Copyright 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,6 +22,8 @@
 #include "defs.h"
 #include "osabi.h"
 
+#include "gdb_string.h"
+
 #include "arm-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"