* sparc-nat.c: Include "inf-ptrace.h".

(sparc_target): New function.
* sparc-nat.h: Update copyright year.
(sparc_target): New prototype.
* sparcnbsd-nat.c: Don't include "gdbcore.h", include "target.h".
(_initialize_sparcnbsd_nat): Construct and add target vector.
* sparc64nbsd-nat.c: Include "target.h".
(_initialize_sparc64nbsd_nat): Construct and add target vector.
* Makefile.in (sparc-nat.o, sparcnbsd-nat.o, sparc64nbsd-nat.o):
Update dependencies.
* config/sparc/nbsd64.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o, add inf-ptrace.o.
* config/sparc/nbsdaout.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o, add inf-ptrace.o and bsd-kvm.o.
(NAT_FILE): Set to nm-bsd.h.
(LOADLIBES): New variable.
* config/sparc/nbsdelf.mh (NATDEPFILES): Remove infptrace.o and
infarg.o, add inf-ptrace.o.
* config/sparc/nm-nbsdaout.h: Remove file.
* config/sparc/fbsd.mh (NATDEPFILES): Add inf-ptrace.o.
* config/sparc/linux.mh (NATDEPFILES): Add inf-ptrace.o.
* config/sparc/linux64.mh (NATDEPFILES): Add inf-ptrace.o.

6 files changed, 12 insertions, 10 deletions

diff --git a/gdb/config/sparc/fbsd.mh b/gdb/config/sparc/fbsd.mh
index fb491a5..ec9a31a 100644
--- a/gdb/config/sparc/fbsd.mh
+++ b/gdb/config/sparc/fbsd.mh
@@ -1,5 +1,5 @@
 # Host: FreeBSD/sparc64
 NATDEPFILES= sparc64fbsd-nat.o sparc64-nat.o sparc-nat.o \
-	fork-child.o infptrace.o inftarg.o \
+	fork-child.o inf-ptrace.o infptrace.o inftarg.o \
 	solib.o solib-svr4.o solib-legacy.o
 NAT_FILE= nm-fbsd.h
diff --git a/gdb/config/sparc/linux.mh b/gdb/config/sparc/linux.mh
index 67ed965..abd3ed8 100644
--- a/gdb/config/sparc/linux.mh
+++ b/gdb/config/sparc/linux.mh
@@ -1,7 +1,7 @@
 # Host: GNU/Linux SPARC
 NAT_FILE= nm-linux.h
 NATDEPFILES= sparc-nat.o sparc-sol2-nat.o \
-	corelow.o core-regset.o fork-child.o \
+	corelow.o core-regset.o fork-child.o inf-ptrace.o \
 	infptrace.o inftarg.o \
 	proc-service.o thread-db.o \
 	gcore.o linux-nat.o
diff --git a/gdb/config/sparc/linux64.mh b/gdb/config/sparc/linux64.mh
index 5f6aed5..05a63b0 100644
--- a/gdb/config/sparc/linux64.mh
+++ b/gdb/config/sparc/linux64.mh
@@ -2,7 +2,7 @@
 NAT_FILE= nm-linux.h
 NATDEPFILES= sparc-nat.o sparc64-nat.o sparc-sol2-nat.o sparc64-linux-nat.o \
 	corelow.o core-regset.o \
-	fork-child.o infptrace.o inftarg.o \
+	fork-child.o inf-ptrace.o infptrace.o inftarg.o \
 	proc-service.o thread-db.o \
 	gcore.o linux-nat.o
 
diff --git a/gdb/config/sparc/nbsd64.mh b/gdb/config/sparc/nbsd64.mh
index 9ac8cf4..95d4166 100644
--- a/gdb/config/sparc/nbsd64.mh
+++ b/gdb/config/sparc/nbsd64.mh
@@ -1,6 +1,6 @@
 # Host: NetBSD/sparc64
-NATDEPFILES= sparc64nbsd-nat.o sparc-nat.o bsd-kvm.o \
-	fork-child.o infptrace.o inftarg.o
+NATDEPFILES= fork-child.o inf-ptrace.o \
+	sparc64nbsd-nat.o sparc-nat.o bsd-kvm.o
 NAT_FILE= nm-nbsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/sparc/nbsdaout.mh b/gdb/config/sparc/nbsdaout.mh
index 8944e60..cd0067d 100644
--- a/gdb/config/sparc/nbsdaout.mh
+++ b/gdb/config/sparc/nbsdaout.mh
@@ -1,4 +1,6 @@
 # Host: NetBSD/sparc a.out
-NATDEPFILES= sparc-nat.o sparcnbsd-nat.o \
-	fork-child.o infptrace.o inftarg.o solib-sunos.o
-NAT_FILE= nm-nbsdaout.h
+NATDEPFILES= fork-child.o inf-ptrace.o \
+	sparc-nat.o sparcnbsd-nat.o bsd-kvm.o solib-sunos.o
+NAT_FILE= nm-nbsd.h
+
+LOADLIBES= -lkvm
diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh
index 611a6a4..d258fcc 100644
--- a/gdb/config/sparc/nbsdelf.mh
+++ b/gdb/config/sparc/nbsdelf.mh
@@ -1,6 +1,6 @@
 # Host: NetBSD/sparc ELF
-NATDEPFILES= sparc-nat.o sparcnbsd-nat.o bsd-kvm.o \
-	fork-child.o infptrace.o inftarg.o
+NATDEPFILES= fork-child.o inf-ptrace.o \
+	sparc-nat.o sparcnbsd-nat.o bsd-kvm.o
 NAT_FILE= nm-nbsd.h
 
 LOADLIBES= -lkvm