* sparc64fbsd-nat.c: Include "fbsd-nat.h".

(_initialize_sparc64fbsd_nat): Add some extra features to the
generic SPARC target.
* Makefile.in (sparc64fbsd-nat.o): Update dependencies.
* config/sparc/fbsd.mh (NATDEPFILES): Add fbsd-nat.o and gcore.o.
(NAT_FILE): Set to solib.h.
* config/sparc/nm-fbsd.h: Remove file.

gdb/ChangeLog

@@ -1,5 +1,13 @@
 2005-01-16  Mark Kettenis  <kettenis@gnu.org>
 
+	* sparc64fbsd-nat.c: Include "fbsd-nat.h".
+	(_initialize_sparc64fbsd_nat): Add some extra features to the
+	generic SPARC target.
+	* Makefile.in (sparc64fbsd-nat.o): Update dependencies.
+	* config/sparc/fbsd.mh (NATDEPFILES): Add fbsd-nat.o and gcore.o.
+	(NAT_FILE): Set to solib.h.
+	* config/sparc/nm-fbsd.h: Remove file.
+
 	* sparc64-tdep.c (sparc64_store_arguments): Fix typo.
 
 	* sparc-tdep.c (sparc_integral_or_pointer_p): Simplify.

gdb/Makefile.in

@@ -2533,7 +2533,7 @@ source.o: source.c $(defs_h) $(symtab_h) $(expression_h) $(language_h) \
 	$(symfile_h) $(objfiles_h) $(annotate_h) $(gdbtypes_h) $(linespec_h) \
 	$(filenames_h) $(completer_h) $(ui_out_h) $(readline_h)
 sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(target_h) \
-	$(sparc64_tdep_h) $(sparc_nat_h)
+	$(fbsd_nat_h) $(sparc64_tdep_h) $(sparc_nat_h)
 sparc64fbsd-tdep.o: sparc64fbsd-tdep.c $(defs_h) $(frame_h) \
 	$(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) $(regset_h) \
 	$(target_h) $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) \

gdb/config/sparc/fbsd.mh

@@ -1,5 +1,5 @@
 # Host: FreeBSD/sparc64
 NATDEPFILES= fork-child.o inf-ptrace.o \
-	sparc64fbsd-nat.o sparc64-nat.o sparc-nat.o \
-	solib.o solib-svr4.o solib-legacy.o
-NAT_FILE= nm-fbsd.h
+	fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64fbsd-nat.o \
+	gcore.o solib.o solib-svr4.o solib-legacy.o
+NAT_FILE= solib.h

gdb/config/sparc/nm-fbsd.h

@@ -1,32 +0,0 @@
-/* Native-dependent definitions for FreeBSD/sparc64.
-
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
-   Contributed by David E. O'Brien <obrien@FreeBSD.org>.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef NM_FBSD_H
-#define NM_FBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-/* Shared library support.  */
-
-#include "solib.h"
-
-#endif /* nm-fbsd.h */

gdb/sparc64fbsd-nat.c

@@ -22,6 +22,7 @@
 #include "defs.h"
 #include "target.h"
 
+#include "fbsd-nat.h"
 #include "sparc64-tdep.h"
 #include "sparc-nat.h"
 
@@ -31,8 +32,14 @@ void _initialize_sparc64fbsd_nat (void);
 void
 _initialize_sparc64fbsd_nat (void)
 {
-  sparc_gregset = &sparc64fbsd_gregset;
+  struct target_ops *t;
+
+  /* Add some extra features to the generic SPARC target.  */
+  t = sparc_target ();
+  t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
+  t->to_find_memory_regions = fbsd_find_memory_regions;
+  t->to_make_corefile_notes = fbsd_make_corefile_notes;
+  add_target (t);
 
-  /* We've got nothing to add to the generic SPARC target.  */
-  add_target (sparc_target ());
+  sparc_gregset = &sparc64fbsd_gregset;
 }