* sparcnbsd-tdep.c (sparc32nbsd_elf_init_abi): Set

solib_svr4_fetch_link_map_offsets to
svr4_ilp32_fetch_link_map_offsets.
* sparcobsd-tdep.c: Don't include "nbsd-tdep.h".
(sparc32obsd_init_abi): Set solib_svr4_fetch_link_map_offsets to
svr4_ilp32_fetch_link_map_offsets.
* Makefile.in (sparcobsd-tdep.o): Update dependencies.

gdb/ChangeLog

@@ -1,3 +1,13 @@
+2004-09-08  Mark Kettenis  <kettenis@gnu.org>
+
+	* sparcnbsd-tdep.c (sparc32nbsd_elf_init_abi): Set
+	solib_svr4_fetch_link_map_offsets to
+	svr4_ilp32_fetch_link_map_offsets.
+	* sparcobsd-tdep.c: Don't include "nbsd-tdep.h".
+	(sparc32obsd_init_abi): Set solib_svr4_fetch_link_map_offsets to
+	svr4_ilp32_fetch_link_map_offsets.
+	* Makefile.in (sparcobsd-tdep.o): Update dependencies.
+
 2004-09-07  Jim Blandy  <jimb@redhat.com>
 
 	* frame.h (frame_register): Doc fix.

gdb/Makefile.in

@@ -2527,7 +2527,7 @@ sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(gdb_string_h) $(sparc_tdep_h) $(nbsd_tdep_h)
 sparcobsd-tdep.o: sparcobsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(frame_unwind_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) \
-	$(trad_frame_h) $(gdb_assert_h) $(sparc_tdep_h) $(nbsd_tdep_h)
+	$(trad_frame_h) $(gdb_assert_h) $(sparc_tdep_h)
 sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \
 	$(sparc_tdep_h) $(sparc64_tdep_h)
 sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \

gdb/sparcnbsd-tdep.c

@@ -298,7 +298,7 @@ sparc32nbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   sparc32nbsd_init_abi (info, gdbarch);
 
   set_solib_svr4_fetch_link_map_offsets
-    (gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }
 
 static enum gdb_osabi

gdb/sparcobsd-tdep.c

@@ -31,7 +31,6 @@
 #include "gdb_assert.h"
 
 #include "sparc-tdep.h"
-#include "nbsd-tdep.h"
 
 /* Signal trampolines.  */
 
@@ -155,7 +154,7 @@ sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   frame_unwind_append_sniffer (gdbarch, sparc32obsd_sigtramp_frame_sniffer);
 
   set_solib_svr4_fetch_link_map_offsets
-    (gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }