[COMMIT] Convert *BSD/m68k to use target vector inheritance

[Mark Kettenis <kettenis@gnu.org>]

Subject says it all; another nm.h file bites the dust.

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>
 
	* m68kbsd-nat.c (m68kbsd_fetch_inferior_registers): Rename from
	fetch_inferior_registers.  Make static.
	(m68kbsd_store_inferior_registers): Rename from
	store_inferior_registers.  Make static.
	(_initialize_m68kbsd_nat): Construct and add target vector.
	* config/m68k/nbsdaout.mh (NATDEPFILES): Remove infptrace.o and
	inftarg.o.  Add inf-ptrace.o.
	(NAT_FILE): Set to tm-solib.h.
	(LOADLIBES): New variable.
	* config/m68k/nbsdelf.mh (NATDEPFILES): Remove infptrace.o and
	inftarg.o.  Add inf-ptrace.o.
	(NAT_FILE): Delete variable.
	* config/m68k/obsd.mh (NATDEPFILES): Remove infptrace.o and
	inftarg.o.  Add inf-ptrace.o.
	(NAT_FILE): Set to tm-solib.h.
	* config/m68k/nm-nbsdaout.h: Remove file.

 
Index: m68kbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/m68kbsd-nat.c,v
retrieving revision 1.4
diff -u -p -r1.4 m68kbsd-nat.c
--- m68kbsd-nat.c 14 Aug 2004 23:37:04 -0000 1.4
+++ m68kbsd-nat.c 7 Nov 2004 21:23:21 -0000
@@ -106,8 +106,8 @@ m68kbsd_collect_fpregset (struct regcach
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating-point registers).  */
 
-void
-fetch_inferior_registers (int regnum)
+static void
+m68kbsd_fetch_inferior_registers (int regnum)
 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
@@ -135,8 +135,8 @@ fetch_inferior_registers (int regnum)
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating-point registers).  */
 
-void
-store_inferior_registers (int regnum)
+static void
+m68kbsd_store_inferior_registers (int regnum)
 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
@@ -223,6 +223,13 @@ void _initialize_m68kbsd_nat (void);
 void
 _initialize_m68kbsd_nat (void)
 {
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = vaxbsd_fetch_inferior_registers;
+  t->to_store_registers = vaxbsd_store_inferior_registers;
+  add_target (t);
+
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (m68kbsd_supply_pcb);
 }
Index: config/m68k/nbsdaout.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/m68k/nbsdaout.mh,v
retrieving revision 1.2
diff -u -p -r1.2 nbsdaout.mh
--- config/m68k/nbsdaout.mh 4 May 2004 23:47:15 -0000 1.2
+++ config/m68k/nbsdaout.mh 7 Nov 2004 21:23:21 -0000
@@ -1,4 +1,6 @@
 # Host: NetBSD/m68k a.out
-NATDEPFILES= m68kbsd-nat.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= m68kbsd-nat.o fork-child.o inf-ptrace.o \
 	solib.o solib-sunos.o
-NAT_FILE= nm-nbsdaout.h
+NAT_FILE= tm-solib.h
+
+LOADLIBES= -lkvm
\ No newline at end of file
Index: config/m68k/nbsdelf.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/m68k/nbsdelf.mh,v
retrieving revision 1.4
diff -u -p -r1.4 nbsdelf.mh
--- config/m68k/nbsdelf.mh 12 Sep 2004 15:29:36 -0000 1.4
+++ config/m68k/nbsdelf.mh 7 Nov 2004 21:23:21 -0000
@@ -1,5 +1,4 @@
 # Host: NetBSD/m68k ELF
-NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= config/nm-nbsd.h
+NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
 
 LOADLIBES= -lkvm
Index: config/m68k/obsd.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/m68k/obsd.mh,v
retrieving revision 1.2
diff -u -p -r1.2 obsd.mh
--- config/m68k/obsd.mh 3 Jul 2004 15:14:48 -0000 1.2
+++ config/m68k/obsd.mh 7 Nov 2004 21:23:21 -0000
@@ -1,6 +1,6 @@
 # Host: OpenBSD/m68k
-NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o \
 	solib.o solib-sunos.o
-NAT_FILE= nm-nbsdaout.h
+NAT_FILE= tm-solib.h
 
 LOADLIBES= -lkvm