Normalize names of the NetBSD files

The files used to be named 'nbsd', which incorrectly reflects
the name of the OS and confuses it with other BSD derived OSes.

gdb/ChangeLog:

        * Makefile.in (ALL_64_TARGET_OBS, ALL_TARGET_OBS)
        HFILES_NO_SRCDIR, ALLDEPFILES): Rename files.
        * alpha-bsd-nat.c: Adjust include.
        * alpha-bsd-tdep.h: Adjust comment.
        * alpha-nbsd-tdep.c: Rename to ...
        * alpha-netbsd-tdep.c: ... this, adjust include.
        * amd64-nbsd-nat.c: Rename to ...
        * amd64-netbsd-nat.c: ... this, adjust include.
        * amd64-nbsd-tdep.c: Rename to ...
        * amd64-netbsd-tdep.c: ... this, adjust include.
        * amd64-tdep.h: Adjust include.
        * arm-nbsd-nat.c: Rename to ...
        * arm-netbsd-nat.c: ... this, adjust include.
        * arm-nbsd-tdep.c: Rename to ...
        * arm-netbsd-tdep.c: ... this, adjust include.
        * arm-nbsd-tdep.h: Rename to ...
        * arm-netbsd-tdep.h: ... this, adjust include.
        * configure.nat: Adjust file lists.
        * configure.tgt: Likewise.
        * hppa-nbsd-nat.c: Rename to ...
        * hppa-netbsd-nat.c: ... this, adjust include.
        * hppa-nbsd-tdep.c: Rename to ...
        * hppa-netbsd-tdep.c: ... this, adjust include.
        * i386-nbsd-nat.c: Rename to ...
        * i386-netbsd-nat.c: ... this, adjust include.
        * i386-nbsd-tdep.c: Rename to ...
        * i386-netbsd-tdep.c: ... this, adjust include.
        * m68k-bsd-nat.c: Adjust include.
        * mips-nbsd-nat.c: Rename to ...
        * mips-netbsd-nat.c: ... this, adjust include.
        * mips-nbsd-tdep.c: Rename to ...
        * mips-netbsd-tdep.c: ... this, adjust include.
        * mips-nbsd-tdep.h: Rename to ...
        * mips-netbsd-tdep.h: ... this.
        * nbsd-nat.c: Rename to ...
        * netbsd-nat.c: ... this, adjust include.
        * nbsd-nat.h: Rename to ...
        * netbsd-nat.h: ... this, adjust include.
        * nbsd-tdep.c: Rename to ...
        * netbsd-tdep.c: ... this, adjust include.
        * nbsd-tdep.h: Rename to ...
        * netbsd-tdep.h: ... this.
        * ppc-nbsd-nat.c: Rename to ...
        * ppc-netbsd-nat.c: ... this, adjust include.
        * ppc-nbsd-tdep.c: Rename to ...
        * ppc-netbsd-tdep.c: ... this, adjust include and comment.
        * ppc-nbsd-tdep.h: Rename to ...
        * ppc-netbsd-tdep.h: ... this.
        * sh-nbsd-nat.c: Rename to ...
        * sh-netbsd-nat.c: ... this, adjust include.
        * sh-nbsd-tdep.c: Rename to ...
        * sh-netbsd-tdep.c: ... this, adjust include.
        * sparc-nbsd-nat.c: Rename to ...
        * sparc-netbsd-nat.c: ... this.
        * sparc-nbsd-tdep.c: Rename to ...
        * sparc-netbsd-tdep.c: ... this, adjust include.
        * sparc64-nbsd-nat.c: Rename to ...
        * sparc64-netbsd-nat.c: ... this.
        * sparc64-nbsd-tdep.c: Rename to ...
        * sparc64-netbsd-tdep.c: ... this, adjust include.
        * sparc64-tdep.h: Adjust comment.
        * vax-bsd-nat.c: Adjust include.
        * vax-nbsd-tdep.c: Rename to ...
        * vax-netbsd-tdep.c: ... this, adjust include.

37 files changed, 166 insertions, 99 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7dc3590..7953038 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,70 @@
+2020-10-13  Kamil Rytarowski  <n54@gmx.com>
+
+	* Makefile.in (ALL_64_TARGET_OBS, ALL_TARGET_OBS)
+	HFILES_NO_SRCDIR, ALLDEPFILES): Rename files.
+	* alpha-bsd-nat.c: Adjust include.
+	* alpha-bsd-tdep.h: Adjust comment.
+	* alpha-nbsd-tdep.c: Rename to ...
+	* alpha-netbsd-tdep.c: ... this, adjust include.
+	* amd64-nbsd-nat.c: Rename to ...
+	* amd64-netbsd-nat.c: ... this, adjust include.
+	* amd64-nbsd-tdep.c: Rename to ...
+	* amd64-netbsd-tdep.c: ... this, adjust include.
+	* amd64-tdep.h: Adjust include.
+	* arm-nbsd-nat.c: Rename to ...
+	* arm-netbsd-nat.c: ... this, adjust include.
+	* arm-nbsd-tdep.c: Rename to ...
+	* arm-netbsd-tdep.c: ... this, adjust include.
+	* arm-nbsd-tdep.h: Rename to ...
+	* arm-netbsd-tdep.h: ... this, adjust include.
+	* configure.nat: Adjust file lists.
+	* configure.tgt: Likewise.
+	* hppa-nbsd-nat.c: Rename to ...
+	* hppa-netbsd-nat.c: ... this, adjust include.
+	* hppa-nbsd-tdep.c: Rename to ...
+	* hppa-netbsd-tdep.c: ... this, adjust include.
+	* i386-nbsd-nat.c: Rename to ...
+	* i386-netbsd-nat.c: ... this, adjust include.
+	* i386-nbsd-tdep.c: Rename to ...
+	* i386-netbsd-tdep.c: ... this, adjust include.
+	* m68k-bsd-nat.c: Adjust include.
+	* mips-nbsd-nat.c: Rename to ...
+	* mips-netbsd-nat.c: ... this, adjust include.
+	* mips-nbsd-tdep.c: Rename to ...
+	* mips-netbsd-tdep.c: ... this, adjust include.
+	* mips-nbsd-tdep.h: Rename to ...
+	* mips-netbsd-tdep.h: ... this.
+	* nbsd-nat.c: Rename to ...
+	* netbsd-nat.c: ... this, adjust include.
+	* nbsd-nat.h: Rename to ...
+	* netbsd-nat.h: ... this, adjust include.
+	* nbsd-tdep.c: Rename to ...
+	* netbsd-tdep.c: ... this, adjust include.
+	* nbsd-tdep.h: Rename to ...
+	* netbsd-tdep.h: ... this.
+	* ppc-nbsd-nat.c: Rename to ...
+	* ppc-netbsd-nat.c: ... this, adjust include.
+	* ppc-nbsd-tdep.c: Rename to ...
+	* ppc-netbsd-tdep.c: ... this, adjust include and comment.
+	* ppc-nbsd-tdep.h: Rename to ...
+	* ppc-netbsd-tdep.h: ... this.
+	* sh-nbsd-nat.c: Rename to ...
+	* sh-netbsd-nat.c: ... this, adjust include.
+	* sh-nbsd-tdep.c: Rename to ...
+	* sh-netbsd-tdep.c: ... this, adjust include.
+	* sparc-nbsd-nat.c: Rename to ...
+	* sparc-netbsd-nat.c: ... this.
+	* sparc-nbsd-tdep.c: Rename to ...
+	* sparc-netbsd-tdep.c: ... this, adjust include.
+	* sparc64-nbsd-nat.c: Rename to ...
+	* sparc64-netbsd-nat.c: ... this.
+	* sparc64-nbsd-tdep.c: Rename to ...
+	* sparc64-netbsd-tdep.c: ... this, adjust include.
+	* sparc64-tdep.h: Adjust comment.
+	* vax-bsd-nat.c: Adjust include.
+	* vax-nbsd-tdep.c: Rename to ...
+	* vax-netbsd-tdep.c: ... this, adjust include.
+
 2020-10-12  Tom Tromey  <tom@tromey.com>
 
 	* target.h (struct target_ops) <get_section_table>: Update.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5f92e87..8a16089 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -678,14 +678,14 @@ ALL_64_TARGET_OBS = \
 	alpha-bsd-tdep.o \
 	alpha-linux-tdep.o \
 	alpha-mdebug-tdep.o \
-	alpha-nbsd-tdep.o \
+	alpha-netbsd-tdep.o \
 	alpha-obsd-tdep.o \
 	alpha-tdep.o \
 	amd64-darwin-tdep.o \
 	amd64-dicos-tdep.o \
 	amd64-fbsd-tdep.o \
 	amd64-linux-tdep.o \
-	amd64-nbsd-tdep.o \
+	amd64-netbsd-tdep.o \
 	amd64-obsd-tdep.o \
 	amd64-sol2-tdep.o \
 	amd64-tdep.o \
@@ -699,7 +699,7 @@ ALL_64_TARGET_OBS = \
 	mips64-obsd-tdep.o \
 	sparc64-fbsd-tdep.o \
 	sparc64-linux-tdep.o \
-	sparc64-nbsd-tdep.o \
+	sparc64-netbsd-tdep.o \
 	sparc64-obsd-tdep.o \
 	sparc64-sol2-tdep.o \
 	sparc64-tdep.o
@@ -720,7 +720,7 @@ ALL_TARGET_OBS = \
 	arm-bsd-tdep.o \
 	arm-fbsd-tdep.o \
 	arm-linux-tdep.o \
-	arm-nbsd-tdep.o \
+	arm-netbsd-tdep.o \
 	arm-obsd-tdep.o \
 	arm-pikeos-tdep.o \
 	arm-symbian-tdep.o \
@@ -744,7 +744,7 @@ ALL_TARGET_OBS = \
 	h8300-tdep.o \
 	hppa-bsd-tdep.o \
 	hppa-linux-tdep.o \
-	hppa-nbsd-tdep.o \
+	hppa-netbsd-tdep.o \
 	hppa-obsd-tdep.o \
 	hppa-tdep.o \
 	i386-bsd-tdep.o \
@@ -754,7 +754,7 @@ ALL_TARGET_OBS = \
 	i386-gnu-tdep.o \
 	i386-go32-tdep.o \
 	i386-linux-tdep.o \
-	i386-nbsd-tdep.o \
+	i386-netbsd-tdep.o \
 	i386-nto-tdep.o \
 	i386-obsd-tdep.o \
 	i386-sol2-tdep.o \
@@ -777,14 +777,14 @@ ALL_TARGET_OBS = \
 	microblaze-tdep.o \
 	mips-fbsd-tdep.o \
 	mips-linux-tdep.o \
-	mips-nbsd-tdep.o \
+	mips-netbsd-tdep.o \
 	mips-sde-tdep.o \
 	mips-tdep.o \
 	mn10300-linux-tdep.o \
 	mn10300-tdep.o \
 	moxie-tdep.o \
 	msp430-tdep.o \
-	nbsd-tdep.o \
+	netbsd-tdep.o \
 	nds32-tdep.o \
 	nios2-linux-tdep.o \
 	nios2-tdep.o \
@@ -794,7 +794,7 @@ ALL_TARGET_OBS = \
 	or1k-tdep.o \
 	ppc-fbsd-tdep.o \
 	ppc-linux-tdep.o \
-	ppc-nbsd-tdep.o \
+	ppc-netbsd-tdep.o \
 	ppc-obsd-tdep.o \
 	ppc-ravenscar-thread.o \
 	ppc-sysv-tdep.o \
@@ -814,7 +814,7 @@ ALL_TARGET_OBS = \
 	s390-tdep.o \
 	score-tdep.o \
 	sh-linux-tdep.o \
-	sh-nbsd-tdep.o \
+	sh-netbsd-tdep.o \
 	sh-tdep.o \
 	sol2-tdep.o \
 	solib-aix.o \
@@ -823,7 +823,7 @@ ALL_TARGET_OBS = \
 	solib-frv.o \
 	solib-svr4.o \
 	sparc-linux-tdep.o \
-	sparc-nbsd-tdep.o \
+	sparc-netbsd-tdep.o \
 	sparc-obsd-tdep.o \
 	sparc-ravenscar-thread.o \
 	sparc-sol2-tdep.o \
@@ -834,7 +834,7 @@ ALL_TARGET_OBS = \
 	tilegx-linux-tdep.o \
 	tilegx-tdep.o \
 	v850-tdep.o \
-	vax-nbsd-tdep.o \
+	vax-netbsd-tdep.o \
 	vax-tdep.o \
 	windows-tdep.o \
 	x86-tdep.o \
@@ -1224,7 +1224,7 @@ HFILES_NO_SRCDIR = \
 	arc-tdep.h \
 	arch-utils.h \
 	arm-linux-tdep.h \
-	arm-nbsd-tdep.h \
+	arm-netbsd-tdep.h \
 	arm-tdep.h \
 	async-event.h \
 	auto-load.h \
@@ -1342,12 +1342,12 @@ HFILES_NO_SRCDIR = \
 	memrange.h \
 	microblaze-tdep.h \
 	mips-linux-tdep.h \
-	mips-nbsd-tdep.h \
+	mips-netbsd-tdep.h \
 	mips-tdep.h \
 	mn10300-tdep.h \
 	moxie-tdep.h \
-	nbsd-nat.h \
-	nbsd-tdep.h \
+	netbsd-nat.h \
+	netbsd-tdep.h \
 	nds32-tdep.h \
 	nios2-tdep.h \
 	nto-tdep.h \
@@ -1361,7 +1361,7 @@ HFILES_NO_SRCDIR = \
 	parser-defs.h \
 	ppc-fbsd-tdep.h \
 	ppc-linux-tdep.h \
-	ppc-nbsd-tdep.h \
+	ppc-netbsd-tdep.h \
 	ppc-obsd-tdep.h \
 	ppc-ravenscar-thread.h \
 	ppc-tdep.h \
@@ -2124,7 +2124,7 @@ ALLDEPFILES = \
 	alpha-linux-nat.c \
 	alpha-linux-tdep.c \
 	alpha-mdebug-tdep.c \
-	alpha-nbsd-tdep.c \
+	alpha-netbsd-tdep.c \
 	alpha-obsd-tdep.c \
 	alpha-tdep.c \
 	amd64-bsd-nat.c \
@@ -2135,8 +2135,8 @@ ALLDEPFILES = \
 	amd64-linux-nat.c \
 	amd64-linux-tdep.c \
 	amd64-nat.c \
-	amd64-nbsd-nat.c \
-	amd64-nbsd-tdep.c \
+	amd64-netbsd-nat.c \
+	amd64-netbsd-tdep.c \
 	amd64-obsd-nat.c \
 	amd64-obsd-tdep.c \
 	amd64-sol2-tdep.c \
@@ -2150,8 +2150,8 @@ ALLDEPFILES = \
 	arm-linux.c \
 	arm-linux-nat.c \
 	arm-linux-tdep.c \
-	arm-nbsd-nat.c \
-	arm-nbsd-tdep.c \
+	arm-netbsd-nat.c \
+	arm-netbsd-tdep.c \
 	arm-obsd-tdep.c \
 	arm-symbian-tdep.c \
 	arm-tdep.c \
@@ -2175,8 +2175,8 @@ ALLDEPFILES = \
 	hppa-bsd-tdep.c \
 	hppa-linux-nat.c \
 	hppa-linux-tdep.c \
-	hppa-nbsd-nat.c \
-	hppa-nbsd-tdep.c \
+	hppa-netbsd-nat.c \
+	hppa-netbsd-tdep.c \
 	hppa-obsd-nat.c \
 	hppa-obsd-tdep.c \
 	hppa-tdep.c \
@@ -2191,8 +2191,8 @@ ALLDEPFILES = \
 	i386-gnu-tdep.c \
 	i386-linux-nat.c \
 	i386-linux-tdep.c \
-	i386-nbsd-nat.c \
-	i386-nbsd-tdep.c \
+	i386-netbsd-nat.c \
+	i386-netbsd-tdep.c \
 	i386-obsd-nat.c \
 	i386-obsd-tdep.c \
 	i386-sol2-nat.c \
@@ -2226,15 +2226,15 @@ ALLDEPFILES = \
 	mips-fbsd-tdep.c \
 	mips-linux-nat.c \
 	mips-linux-tdep.c \
-	mips-nbsd-nat.c \
-	mips-nbsd-tdep.c \
+	mips-netbsd-nat.c \
+	mips-netbsd-tdep.c \
 	mips-sde-tdep.c \
 	mips-tdep.c \
 	mips64-obsd-nat.c \
 	mips64-obsd-tdep.c \
 	msp430-tdep.c \
-	nbsd-nat.c \
-	nbsd-tdep.c \
+	netbsd-nat.c \
+	netbsd-tdep.c \
 	nds32-tdep.c \
 	nios2-linux-tdep.c \
 	nios2-tdep.c \
@@ -2245,8 +2245,8 @@ ALLDEPFILES = \
 	ppc-fbsd-tdep.c \
 	ppc-linux-nat.c \
 	ppc-linux-tdep.c \
-	ppc-nbsd-nat.c \
-	ppc-nbsd-tdep.c \
+	ppc-netbsd-nat.c \
+	ppc-netbsd-tdep.c \
 	ppc-obsd-nat.c \
 	ppc-obsd-tdep.c \
 	ppc-ravenscar-thread.c \
@@ -2275,8 +2275,8 @@ ALLDEPFILES = \
 	ser-pipe.c \
 	ser-tcp.c \
 	ser-uds.c \
-	sh-nbsd-nat.c \
-	sh-nbsd-tdep.c \
+	sh-netbsd-nat.c \
+	sh-netbsd-tdep.c \
 	sh-tdep.c \
 	sol2-tdep.c \
 	solib-aix.c \
@@ -2284,8 +2284,8 @@ ALLDEPFILES = \
 	sparc-linux-nat.c \
 	sparc-linux-tdep.c \
 	sparc-nat.c \
-	sparc-nbsd-nat.c \
-	sparc-nbsd-tdep.c \
+	sparc-netbsd-nat.c \
+	sparc-netbsd-tdep.c \
 	sparc-obsd-tdep.c \
 	sparc-ravenscar-thread.c \
 	sparc-sol2-nat.c \
@@ -2296,8 +2296,8 @@ ALLDEPFILES = \
 	sparc64-linux-nat.c \
 	sparc64-linux-tdep.c \
 	sparc64-nat.c \
-	sparc64-nbsd-nat.c \
-	sparc64-nbsd-tdep.c \
+	sparc64-netbsd-nat.c \
+	sparc64-netbsd-tdep.c \
 	sparc64-obsd-nat.c \
 	sparc64-obsd-tdep.c \
 	sparc64-sol2-tdep.c \
@@ -2307,7 +2307,7 @@ ALLDEPFILES = \
 	tilegx-tdep.c \
 	v850-tdep.c \
 	vax-bsd-nat.c \
-	vax-nbsd-tdep.c \
+	vax-netbsd-tdep.c \
 	vax-tdep.c \
 	windows-nat.c \
 	windows-tdep.c \
diff --git a/gdb/alpha-bsd-nat.c b/gdb/alpha-bsd-nat.c
index 8a82739..df9892e 100644
--- a/gdb/alpha-bsd-nat.c
+++ b/gdb/alpha-bsd-nat.c
@@ -26,7 +26,7 @@
 #include "alpha-tdep.h"
 #include "alpha-bsd-tdep.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
diff --git a/gdb/alpha-bsd-tdep.h b/gdb/alpha-bsd-tdep.h
index a8fd7ba..728763f 100644
--- a/gdb/alpha-bsd-tdep.h
+++ b/gdb/alpha-bsd-tdep.h
@@ -31,7 +31,7 @@ void alphabsd_supply_fpreg (struct regcache *, const char *, int);
 void alphabsd_fill_fpreg (const struct regcache *, char *, int);
 
 
-/* Functions exported from alpha-nbsd-tdep.c.  */
+/* Functions exported from alpha-netbsd-tdep.c.  */
 
 /* Iterate over supported core file register note sections. */
 void alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
diff --git a/gdb/alpha-nbsd-tdep.c b/gdb/alpha-netbsd-tdep.c
index 58294ed..c78e496 100644
--- a/gdb/alpha-nbsd-tdep.c
+++ b/gdb/alpha-netbsd-tdep.c
@@ -29,7 +29,7 @@
 
 #include "alpha-tdep.h"
 #include "alpha-bsd-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "solib-svr4.h"
 #include "target.h"
 
diff --git a/gdb/amd64-nbsd-nat.c b/gdb/amd64-netbsd-nat.c
index 7a4c0057..f518d37 100644
--- a/gdb/amd64-nbsd-nat.c
+++ b/gdb/amd64-netbsd-nat.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "target.h"
 
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 #include "amd64-tdep.h"
 #include "amd64-bsd-nat.h"
 #include "amd64-nat.h"
diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-netbsd-tdep.c
index 5907148..16c4f0b 100644
--- a/gdb/amd64-nbsd-tdep.c
+++ b/gdb/amd64-netbsd-tdep.c
@@ -26,7 +26,7 @@
 
 #include "amd64-tdep.h"
 #include "gdbsupport/x86-xstate.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* Support for signal handlers.  */
diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
index 44c1250..a4e6956 100644
--- a/gdb/amd64-tdep.h
+++ b/gdb/amd64-tdep.h
@@ -139,7 +139,7 @@ extern const struct regset amd64_fpregset;
 /* Variables exported from amd64-linux-tdep.c.  */
 extern int amd64_linux_gregset_reg_offset[];
 
-/* Variables exported from amd64-nbsd-tdep.c.  */
+/* Variables exported from amd64-netbsd-tdep.c.  */
 extern int amd64nbsd_r_reg_offset[];
 
 /* Variables exported from amd64-obsd-tdep.c.  */
diff --git a/gdb/arm-nbsd-nat.c b/gdb/arm-netbsd-nat.c
index a8a67e6..acdbdd3 100644
--- a/gdb/arm-nbsd-nat.c
+++ b/gdb/arm-netbsd-nat.c
@@ -31,10 +31,10 @@
 #include <machine/frame.h>
 
 #include "arm-tdep.h"
-#include "arm-nbsd-tdep.h"
+#include "arm-netbsd-tdep.h"
 #include "aarch32-tdep.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 class arm_netbsd_nat_target final : public nbsd_nat_target
 {
diff --git a/gdb/arm-nbsd-tdep.c b/gdb/arm-netbsd-tdep.c
index b1e369d..fa2e449 100644
--- a/gdb/arm-nbsd-tdep.c
+++ b/gdb/arm-netbsd-tdep.c
@@ -21,8 +21,8 @@
 #include "osabi.h"
 
 #include "arch/arm.h"
-#include "arm-nbsd-tdep.h"
-#include "nbsd-tdep.h"
+#include "arm-netbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "arm-tdep.h"
 #include "regset.h"
 #include "solib-svr4.h"
diff --git a/gdb/arm-nbsd-tdep.h b/gdb/arm-netbsd-tdep.h
index 1b35395..1b35395 100644
--- a/gdb/arm-nbsd-tdep.h
+++ b/gdb/arm-netbsd-tdep.h
diff --git a/gdb/configure.nat b/gdb/configure.nat
index 3e94a06..ef2218f 100644
--- a/gdb/configure.nat
+++ b/gdb/configure.nat
@@ -338,20 +338,20 @@ case ${gdb_host} in
 		;;
 	    mips)
 		# Host: NetBSD/mips
-		NATDEPFILES="${NATDEPFILES} mips-nbsd-nat.o"
+		NATDEPFILES="${NATDEPFILES} mips-netbsd-nat.o"
 		;;
 	    pa)
 		# Host: NetBSD/hppa
-		NATDEPFILES="${NATDEPFILES} nbsd-nat.o hppa-nbsd-nat.o"
+		NATDEPFILES="${NATDEPFILES} netbsd-nat.o hppa-netbsd-nat.o"
 		;;
 	    powerpc)
 		# Host: NetBSD/powerpc
-		NATDEPFILES="${NATDEPFILES} ppc-nbsd-nat.o bsd-kvm.o"
+		NATDEPFILES="${NATDEPFILES} ppc-netbsd-nat.o bsd-kvm.o"
 		LOADLIBES='-lkvm'
 		;;
 	    sh)
 		# Host: NetBSD/sh
-		NATDEPFILES="${NATDEPFILES} sh-nbsd-nat.o"
+		NATDEPFILES="${NATDEPFILES} sh-netbsd-nat.o"
 		;;
 
 	esac
@@ -360,12 +360,12 @@ case ${gdb_host} in
 	case ${gdb_host_cpu} in
 	    i386)
 		# Host: NetBSD/amd64
-		NATDEPFILES="${NATDEPFILES} nbsd-nat.o amd64-nat.o x86-nat.o \
-		nat/x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o"
+		NATDEPFILES="${NATDEPFILES} netbsd-nat.o amd64-nat.o x86-nat.o \
+		nat/x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-netbsd-nat.o"
 		;;
 	    sparc)
 		# Host: NetBSD/sparc64
-		NATDEPFILES="${NATDEPFILES} sparc64-nbsd-nat.o sparc-nat.o \
+		NATDEPFILES="${NATDEPFILES} sparc64-netbsd-nat.o sparc-nat.o \
 		bsd-kvm.o"
 		LOADLIBES='-lkvm'
 		;;
@@ -376,13 +376,13 @@ case ${gdb_host} in
 	case ${gdb_host_cpu} in
 	    arm)
 		# Host: NetBSD/arm
-		NATDEPFILES="${NATDEPFILES} arm-nbsd-nat.o"
+		NATDEPFILES="${NATDEPFILES} arm-netbsd-nat.o"
 		;;
 	    i386)
 		# Host: NetBSD/i386 ELF
-		NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-nat.o \
+		NATDEPFILES="${NATDEPFILES} netbsd-nat.o x86-nat.o \
 		nat/x86-dregs.o \
-		x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o"
+		x86-bsd-nat.o i386-bsd-nat.o i386-netbsd-nat.o bsd-kvm.o"
 		LOADLIBES='-lkvm'
 		;;
 	    m68k)
@@ -392,7 +392,7 @@ case ${gdb_host} in
 		;;
 	    sparc)
 		# Host: NetBSD/sparc ELF
-		NATDEPFILES="${NATDEPFILES} sparc-nat.o sparc-nbsd-nat.o \
+		NATDEPFILES="${NATDEPFILES} sparc-nat.o sparc-netbsd-nat.o \
 		bsd-kvm.o"
 		LOADLIBES='-lkvm'
 		;;
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index a3e11c4..d865ecd 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -138,12 +138,12 @@ alpha*-*-linux*)
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
 	# Target: NetBSD/alpha
 	gdb_target_obs="alpha-mdebug-tdep.o alpha-bsd-tdep.o \
-			alpha-nbsd-tdep.o"
+			alpha-netbsd-tdep.o"
 	;;
 alpha*-*-openbsd*)
 	# Target: OpenBSD/alpha
 	gdb_target_obs="alpha-mdebug-tdep.o alpha-bsd-tdep.o \
-			alpha-nbsd-tdep.o alpha-obsd-tdep.o nbsd-tdep.o"
+			alpha-netbsd-tdep.o alpha-obsd-tdep.o nbsd-tdep.o"
 	;;
 
 am33_2.0*-*-linux*)
@@ -177,7 +177,7 @@ arm*-*-freebsd*)
 	;;
 arm*-*-netbsd* | arm*-*-knetbsd*-gnu)
 	# Target: NetBSD/arm
-	gdb_target_obs="arm-nbsd-tdep.o"
+	gdb_target_obs="arm-netbsd-tdep.o"
 	;;
 arm*-*-openbsd*)
 	# Target: OpenBSD/arm
@@ -256,7 +256,7 @@ hppa*-*-linux*)
 	;;
 hppa*-*-netbsd*)
 	# Target: NetBSD/hppa
-	gdb_target_obs="hppa-bsd-tdep.o hppa-nbsd-tdep.o solib-svr4.o"
+	gdb_target_obs="hppa-bsd-tdep.o hppa-netbsd-tdep.o solib-svr4.o"
 	;;
 hppa*-*-openbsd*)
 	# Target: OpenBSD/hppa
@@ -281,7 +281,7 @@ i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
 	;;
 i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
 	# Target: NetBSD/i386
-	gdb_target_obs="i386-bsd-tdep.o i386-nbsd-tdep.o "
+	gdb_target_obs="i386-bsd-tdep.o i386-netbsd-tdep.o "
 	;;
 i[34567]86-*-openbsd*)
 	# Target: OpenBSD/i386
@@ -418,7 +418,7 @@ mips*-*-linux*)
 	;;
 mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
 	# Target: MIPS running NetBSD
-	gdb_target_obs="mips-tdep.o mips-nbsd-tdep.o"
+	gdb_target_obs="mips-tdep.o mips-netbsd-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 mips*-*-freebsd*)
@@ -495,7 +495,7 @@ powerpc*-*-freebsd*)
 
 powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
 	# Target: NetBSD/powerpc
-	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc-nbsd-tdep.o \
+	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc-netbsd-tdep.o \
 			ravenscar-thread.o ppc-ravenscar-thread.o"
 	gdb_sim=../sim/ppc/libsim.a
 	;;
@@ -581,12 +581,12 @@ sh*-*-linux*)
 	;;
 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
 	# Target: NetBSD/sh
-	gdb_target_obs="sh-tdep.o sh-nbsd-tdep.o"
+	gdb_target_obs="sh-tdep.o sh-netbsd-tdep.o"
 	gdb_sim=../sim/sh/libsim.a
 	;;
 sh*-*-openbsd*)
 	# Target: OpenBSD/sh
-	gdb_target_obs="sh-tdep.o sh-nbsd-tdep.o"
+	gdb_target_obs="sh-tdep.o sh-netbsd-tdep.o"
 	;;
 sh*)
 	# Target: Embedded Renesas Super-H processor
@@ -620,25 +620,25 @@ sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
 	;;
 sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
 	# Target: NetBSD/sparc
-	gdb_target_obs="sparc-tdep.o sparc-nbsd-tdep.o \
+	gdb_target_obs="sparc-tdep.o sparc-netbsd-tdep.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
 	# Target: NetBSD/sparc64
-	gdb_target_obs="sparc64-tdep.o sparc64-nbsd-tdep.o sparc-tdep.o \
-			sparc-nbsd-tdep.o \
+	gdb_target_obs="sparc64-tdep.o sparc64-netbsd-tdep.o sparc-tdep.o \
+			sparc-netbsd-tdep.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc-*-openbsd*)
 	# Target: OpenBSD/sparc
-	gdb_target_obs="sparc-tdep.o sparc-nbsd-tdep.o sparc-obsd-tdep.o \
+	gdb_target_obs="sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
 			nbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc64-*-openbsd*)
 	# Target: OpenBSD/sparc64
-	gdb_target_obs="sparc64-tdep.o sparc64-nbsd-tdep.o sparc64-obsd-tdep.o \
-			sparc-tdep.o sparc-nbsd-tdep.o sparc-obsd-tdep.o \
+	gdb_target_obs="sparc64-tdep.o sparc64-netbsd-tdep.o sparc64-obsd-tdep.o \
+			sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
 			nbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
@@ -746,7 +746,7 @@ x86_64-*-mingw* | x86_64-*-cygwin*)
         ;;
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
 	# Target: NetBSD/amd64
-	gdb_target_obs="amd64-nbsd-tdep.o ${i386_tobjs}"
+	gdb_target_obs="amd64-netbsd-tdep.o ${i386_tobjs}"
 	;;
 x86_64-*-openbsd*)
 	# Target: OpenBSD/amd64
diff --git a/gdb/hppa-nbsd-nat.c b/gdb/hppa-netbsd-nat.c
index c35f30d..a3a2e32 100644
--- a/gdb/hppa-nbsd-nat.c
+++ b/gdb/hppa-netbsd-nat.c
@@ -28,7 +28,7 @@
 #include "hppa-tdep.h"
 #include "inf-ptrace.h"
 
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 class hppa_nbsd_nat_target final : public nbsd_nat_target
 {
diff --git a/gdb/hppa-nbsd-tdep.c b/gdb/hppa-netbsd-tdep.c
index 5309b19..5a55207 100644
--- a/gdb/hppa-nbsd-tdep.c
+++ b/gdb/hppa-netbsd-tdep.c
@@ -27,7 +27,7 @@
 
 #include "hppa-tdep.h"
 #include "hppa-bsd-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "gdbarch.h"
 
 /* From <machine/mcontext.h>.  */
diff --git a/gdb/i386-nbsd-nat.c b/gdb/i386-netbsd-nat.c
index ac775c1..4faa67f 100644
--- a/gdb/i386-nbsd-nat.c
+++ b/gdb/i386-netbsd-nat.c
@@ -31,7 +31,7 @@
 #include <machine/frame.h>
 #include <machine/pcb.h>
 
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 #include "bsd-kvm.h"
 
 static int
diff --git a/gdb/i386-nbsd-tdep.c b/gdb/i386-netbsd-tdep.c
index 82772b4..905c4ff 100644
--- a/gdb/i386-nbsd-tdep.c
+++ b/gdb/i386-netbsd-tdep.c
@@ -30,7 +30,7 @@
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* From <machine/reg.h>.  */
diff --git a/gdb/m68k-bsd-nat.c b/gdb/m68k-bsd-nat.c
index 9c42da5..731aaf0 100644
--- a/gdb/m68k-bsd-nat.c
+++ b/gdb/m68k-bsd-nat.c
@@ -30,7 +30,7 @@
 
 #include "m68k-tdep.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 struct m68k_bsd_nat_target final : public nbsd_nat_target
 {
diff --git a/gdb/mips-nbsd-nat.c b/gdb/mips-netbsd-nat.c
index 461304a..51ea1cb 100644
--- a/gdb/mips-nbsd-nat.c
+++ b/gdb/mips-netbsd-nat.c
@@ -29,7 +29,7 @@
 #include <machine/reg.h>
 
 #include "mips-tdep.h"
-#include "mips-nbsd-tdep.h"
+#include "mips-netbsd-tdep.h"
 #include "inf-ptrace.h"
 
 class mips_nbsd_nat_target final : public inf_ptrace_target
diff --git a/gdb/mips-nbsd-tdep.c b/gdb/mips-netbsd-tdep.c
index 524990a..b6f8773 100644
--- a/gdb/mips-nbsd-tdep.c
+++ b/gdb/mips-netbsd-tdep.c
@@ -27,8 +27,8 @@
 #include "value.h"
 #include "osabi.h"
 
-#include "nbsd-tdep.h"
-#include "mips-nbsd-tdep.h"
+#include "netbsd-tdep.h"
+#include "mips-netbsd-tdep.h"
 #include "mips-tdep.h"
 
 #include "solib-svr4.h"
diff --git a/gdb/mips-nbsd-tdep.h b/gdb/mips-netbsd-tdep.h
index 588f168..588f168 100644
--- a/gdb/mips-nbsd-tdep.h
+++ b/gdb/mips-netbsd-tdep.h
diff --git a/gdb/nbsd-nat.c b/gdb/netbsd-nat.c
index 46dcfac..e7962e0 100644
--- a/gdb/nbsd-nat.c
+++ b/gdb/netbsd-nat.c
@@ -19,10 +19,10 @@
 
 #include "defs.h"
 
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 #include "nat/netbsd-nat.h"
 #include "gdbthread.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "inferior.h"
 #include "gdbarch.h"
 
diff --git a/gdb/nbsd-nat.h b/gdb/netbsd-nat.h
index 7461667..7a55094 100644
--- a/gdb/nbsd-nat.h
+++ b/gdb/netbsd-nat.h
@@ -59,4 +59,4 @@ struct nbsd_nat_target : public inf_ptrace_target
   void dumpcore (const char *filename) override;
 };
 
-#endif /* nbsd-nat.h */
+#endif /* netbsd-nat.h */
diff --git a/gdb/nbsd-tdep.c b/gdb/netbsd-tdep.c
index 2db994a..0fa2d97 100644
--- a/gdb/nbsd-tdep.c
+++ b/gdb/netbsd-tdep.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "auxv.h"
 #include "solib-svr4.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "gdbarch.h"
 #include "objfiles.h"
 #include "xml-syscall.h"
diff --git a/gdb/nbsd-tdep.h b/gdb/netbsd-tdep.h
index a6e3a8f..a6e3a8f 100644
--- a/gdb/nbsd-tdep.h
+++ b/gdb/netbsd-tdep.h
diff --git a/gdb/ppc-nbsd-nat.c b/gdb/ppc-netbsd-nat.c
index 8111f3e..6ecff11 100644
--- a/gdb/ppc-nbsd-nat.c
+++ b/gdb/ppc-netbsd-nat.c
@@ -34,10 +34,10 @@
 #include "regcache.h"
 
 #include "ppc-tdep.h"
-#include "ppc-nbsd-tdep.h"
+#include "ppc-netbsd-tdep.h"
 #include "bsd-kvm.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 struct ppc_nbsd_nat_target final : public nbsd_nat_target
 {
diff --git a/gdb/ppc-nbsd-tdep.c b/gdb/ppc-netbsd-tdep.c
index fa90243..64f2b40 100644
--- a/gdb/ppc-nbsd-tdep.c
+++ b/gdb/ppc-netbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "tramp-frame.h"
 
 #include "ppc-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "ppc-tdep.h"
 #include "solib-svr4.h"
 
@@ -199,7 +199,7 @@ _initialize_ppcnbsd_tdep ()
 			  ppcnbsd_init_abi);
 
   /* Avoid initializing the register offsets again if they were
-     already initialized by ppcnbsd-nat.c.  */
+     already initialized by ppc-netbsd-nat.c.  */
   if (ppcnbsd_reg_offsets.pc_offset == 0)
     {
       /* General-purpose registers.  */
diff --git a/gdb/ppc-nbsd-tdep.h b/gdb/ppc-netbsd-tdep.h
index efbed9e..efbed9e 100644
--- a/gdb/ppc-nbsd-tdep.h
+++ b/gdb/ppc-netbsd-tdep.h
diff --git a/gdb/sh-nbsd-nat.c b/gdb/sh-netbsd-nat.c
index b4f9db6..fcdc4ef 100644
--- a/gdb/sh-nbsd-nat.c
+++ b/gdb/sh-netbsd-nat.c
@@ -28,7 +28,7 @@
 
 #include "sh-tdep.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 #include "regcache.h"
 
 struct sh_nbsd_nat_target final : public nbsd_nat_target
diff --git a/gdb/sh-nbsd-tdep.c b/gdb/sh-netbsd-tdep.c
index 6551c47..eabec98 100644
--- a/gdb/sh-nbsd-tdep.c
+++ b/gdb/sh-netbsd-tdep.c
@@ -26,7 +26,7 @@
 #include "osabi.h"
 
 #include "sh-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "solib-svr4.h"
 #include "gdbarch.h"
 
diff --git a/gdb/sparc-nbsd-nat.c b/gdb/sparc-netbsd-nat.c
index 7138d7d..7138d7d 100644
--- a/gdb/sparc-nbsd-nat.c
+++ b/gdb/sparc-netbsd-nat.c
diff --git a/gdb/sparc-nbsd-tdep.c b/gdb/sparc-netbsd-tdep.c
index ab1b557..7cb4126 100644
--- a/gdb/sparc-nbsd-tdep.c
+++ b/gdb/sparc-netbsd-tdep.c
@@ -32,7 +32,7 @@
 #include "gdbarch.h"
 
 #include "sparc-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 
 /* Macros to extract fields from SPARC instructions.  */
 #define X_RS1(i) (((i) >> 14) & 0x1f)
diff --git a/gdb/sparc64-nbsd-nat.c b/gdb/sparc64-netbsd-nat.c
index 5e249b6..5e249b6 100644
--- a/gdb/sparc64-nbsd-nat.c
+++ b/gdb/sparc64-netbsd-nat.c
diff --git a/gdb/sparc64-nbsd-tdep.c b/gdb/sparc64-netbsd-tdep.c
index dac7fa7..f5329a3 100644
--- a/gdb/sparc64-nbsd-tdep.c
+++ b/gdb/sparc64-netbsd-tdep.c
@@ -31,7 +31,7 @@
 #include "trad-frame.h"
 
 #include "sparc64-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 
 /* From <machine/reg.h>.  */
 const struct sparc_gregmap sparc64nbsd_gregmap =
diff --git a/gdb/sparc64-tdep.h b/gdb/sparc64-tdep.h
index d3ba9e2..f630592 100644
--- a/gdb/sparc64-tdep.h
+++ b/gdb/sparc64-tdep.h
@@ -124,7 +124,7 @@ extern const struct sparc_fpregmap sparc64_sol2_fpregmap;
 /* Register offsets for FreeBSD/sparc64.  */
 extern const struct sparc_gregmap sparc64fbsd_gregmap;
 
-/* Functions and variables exported from sparc64-nbsd-tdep.c.  */
+/* Functions and variables exported from sparc64-netbsd-tdep.c.  */
 
 /* Register offsets for NetBSD/sparc64.  */
 extern const struct sparc_gregmap sparc64nbsd_gregmap;
diff --git a/gdb/vax-bsd-nat.c b/gdb/vax-bsd-nat.c
index 1ca1f7b..8a08f48 100644
--- a/gdb/vax-bsd-nat.c
+++ b/gdb/vax-bsd-nat.c
@@ -30,7 +30,7 @@
 
 #include "vax-tdep.h"
 #include "inf-ptrace.h"
-#include "nbsd-nat.h"
+#include "netbsd-nat.h"
 
 struct vax_bsd_nat_target final : public nbsd_nat_target
 {
diff --git a/gdb/vax-nbsd-tdep.c b/gdb/vax-netbsd-tdep.c
index 40007f1..18add04 100644
--- a/gdb/vax-nbsd-tdep.c
+++ b/gdb/vax-netbsd-tdep.c
@@ -22,7 +22,7 @@
 #include "osabi.h"
 
 #include "vax-tdep.h"
-#include "nbsd-tdep.h"
+#include "netbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* NetBSD ELF.  */