* 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.

4 files changed, 7 insertions, 36 deletions

diff --git a/gdb/config/m68k/nbsdaout.mh b/gdb/config/m68k/nbsdaout.mh
index 90a43d7..910bd88 100644
--- a/gdb/config/m68k/nbsdaout.mh
+++ b/gdb/config/m68k/nbsdaout.mh
@@ -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
diff --git a/gdb/config/m68k/nbsdelf.mh b/gdb/config/m68k/nbsdelf.mh
index c58e348..f2d97a1 100644
--- a/gdb/config/m68k/nbsdelf.mh
+++ b/gdb/config/m68k/nbsdelf.mh
@@ -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
diff --git a/gdb/config/m68k/nm-nbsdaout.h b/gdb/config/m68k/nm-nbsdaout.h
deleted file mode 100644
index e741589..0000000
--- a/gdb/config/m68k/nm-nbsdaout.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Native-dependent definitions for NetBSD/m68k a.out.
-
-   Copyright 1996, 2002, 2004 Free Software Foundation, Inc.
-
-   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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSDAOUT_H
-#define NM_NBSDAOUT_H
-
-#include "config/nm-nbsd.h"
-
-/* Get generic NetBSD a.out native definitions.  */
-#include "config/nm-nbsdaout.h"
-
-#endif /* nm-nbsdaout.h */
diff --git a/gdb/config/m68k/obsd.mh b/gdb/config/m68k/obsd.mh
index 54e4e9d..fdcd5be 100644
--- a/gdb/config/m68k/obsd.mh
+++ b/gdb/config/m68k/obsd.mh
@@ -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