This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Normalize names of some source files
- From: Simon Marchi <simark at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 23 Nov 2016 14:47:07 -0000
- Subject: [binutils-gdb] Normalize names of some source files
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=03b62bbbce3dc5f15131d9e78f77d035cd1cffb3
commit 03b62bbbce3dc5f15131d9e78f77d035cd1cffb3
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date: Tue Nov 22 16:14:24 2016 -0500
Normalize names of some source files
Most tdep/nat files are named:
<cpu>-<os>-tdep.c
<cpu>-<os>-nat.c
A few files do not respect this scheme. This patch renames them so that
they are consistent with the rest of the files. It builds fine with
--enable-targets=all, but that doesn't test the nat files. I can only
hope that my grep skill is good enough.
gdb/ChangeLog:
* Makefile.in (ALL_64_TARGET_OBS, ALL_TARGET_OBS,
HFILES_NO_SRCDIR, ALLDEPFILES): Rename files.
* alphabsd-nat.c: Rename to ...
* alpha-bsd-nat.c: ... this, adjust include.
* alphabsd-tdep.c: Rename to ...
* alpha-bsd-tdep.c: ... this, adjust include.
* alphabsd-tdep.h: Rename to ...
* alpha-bsd-tdep.h: ... this, adjust include barrier and comment.
* alphafbsd-tdep.c: Rename to ...
* alpha-fbsd-tdep.c: ... this.
* alphanbsd-tdep.c: Rename to ...
* alpha-nbsd-tdep.c: ... this, adjust include.
* alphaobsd-tdep.c: Rename to ...
* alpha-obsd-tdep.c: ... this, adjust include.
* amd64bsd-nat.c: Rename to ...
* amd64-bsd-nat.c: ... this, adjust include.
* amd64fbsd-nat.c: Rename to ...
* amd64-fbsd-nat.c: ... this, adjust include.
* amd64fbsd-tdep.c: Rename to ...
* amd64-fbsd-tdep.c: ... this, adjust include.
* amd64nbsd-nat.c: Rename to ...
* amd64-nbsd-nat.c: ... this.
* amd64nbsd-tdep.c: Rename to ...
* amd64-nbsd-tdep.c: ... this.
* amd64obsd-nat.c: Rename to ...
* amd64-obsd-nat.c: ... this.
* amd64obsd-tdep.c: Rename to ...
* amd64-obsd-tdep.c: ... this.
* amd64-tdep.h: Update comments.
* armbsd-tdep.c: Rename to ...
* arm-bsd-tdep.c: ... this.
* armnbsd-nat.c: Rename to ...
* arm-nbsd-nat.c: ... this.
* armnbsd-tdep.c: Rename to ...
* arm-nbsd-tdep.c: ... this.
* armobsd-tdep.c: Rename to ...
* arm-obsd-tdep.c: ... this.
* arm-tdep.h: Update comments.
* hppabsd-tdep.c: Rename to ...
* hppa-bsd-tdep.c: ... this, adjust include.
* hppabsd-tdep.h: Rename to ...
* hppa-bsd-tdep.h: ... this, adjust include barrier and comment.
* hppanbsd-nat.c: Rename to ...
* hppa-nbsd-nat.c: ... this.
* hppanbsd-tdep.c: Rename to ...
* hppa-nbsd-tdep.c: ... this, adjust include.
* hppaobsd-nat.c: Rename to ...
* hppa-obsd-nat.c: ... this.
* hppaobsd-tdep.c: Rename to ...
* hppa-obsd-tdep.c: ... this, adjust include.
* i386bsd-nat.c: Rename to ...
* i386-bsd-nat.c: ... this, adjust include.
* i386bsd-nat.h: Rename to ...
* i386-bsd-nat.h: ... this, adjust include barrier and comment.
* i386bsd-tdep.c: Rename to ...
* i386-bsd-tdep.c: ... this.
* i386fbsd-nat.c: Rename to ...
* i386-fbsd-nat.c: ... this, adjust include.
* i386fbsd-tdep.c: Rename to ...
* i386-fbsd-tdep.c: ... this, adjust include.
* i386fbsd-tdep.h: Rename to ...
* i386-fbsd-tdep.h: ... this, adjust include barrier and comment.
* i386gnu-nat.c: Rename to ...
* i386-gnu-nat.c: ... this.
* i386gnu-tdep.c: Rename to ...
* i386-gnu-tdep.c: ... this.
* i386nbsd-nat.c: Rename to ...
* i386-nbsd-nat.c: ... this, adjust include.
* i386nbsd-tdep.c: Rename to ...
* i386-nbsd-tdep.c: ... this.
* i386obsd-nat.c: Rename to ...
* i386-obsd-nat.c: ... this, adjust include.
* i386obsd-tdep.c: Rename to ...
* i386-obsd-tdep.c: ... this.
* i386v4-nat.c: Rename to ...
* i386-v4-nat.c: ... this.
* i386-tdep.h: Update comments.
* m68k-tdep.h: Update comments.
* m68kbsd-nat.c: Rename to ...
* m68k-bsd-nat.c: ... this.
* m68kbsd-tdep.c: Rename to ...
* m68k-bsd-tdep.c: ... this.
* m68klinux-nat.c: Rename to ...
* m68k-linux-nat.c: ... this.
* m68klinux-tdep.c: Rename to ...
* m68k-linux-tdep.c: ... this.
* m88kbsd-nat.c: Rename to ...
* m88k-bsd-nat.c: ... this.
* mipsnbsd-nat.c: Rename to ...
* mips-nbsd-nat.c: ... this, adjust include.
* mipsnbsd-tdep.c: Rename to ...
* mips-nbsd-tdep.c: ... this, adjust include.
* mipsnbsd-tdep.h: Rename to ...
* mips-nbsd-tdep.h: ... this, adjust include barrier and comment.
* mips64obsd-nat.c: Rename to ...
* mips64-obsd-nat.c: ... this.
* mips64obsd-tdep.c: Rename to ...
* mips64-obsd-tdep.c: ... this.
* ppcfbsd-nat.c: Rename to ...
* ppc-fbsd-nat.c: ... this, adjust include.
* ppcfbsd-tdep.c: Rename to ...
* ppc-fbsd-tdep.c: ... this, adjust include.
* ppcfbsd-tdep.h: Rename to ...
* ppc-fbsd-tdep.h: ... this, adjust include barrier and comment.
* ppcnbsd-nat.c: Rename to ...
* ppc-nbsd-nat.c: ... this, adjust include.
* ppcnbsd-tdep.c: Rename to ...
* ppc-nbsd-tdep.c: ... this, adjust include.
* ppcnbsd-tdep.h: Rename to ...
* ppc-nbsd-tdep.h: ... this, adjust include barrier and comment.
* ppcobsd-nat.c: Rename to ...
* ppc-obsd-nat.c: ... this, adjust include.
* ppcobsd-tdep.c: Rename to ...
* ppc-obsd-tdep.c: ... this, adjust include.
* ppcobsd-tdep.h: Rename to ...
* ppc-obsd-tdep.h: ... this, adjust include barrier and comment.
* shnbsd-nat.c: Rename to ...
* sh-nbsd-nat.c: ... this.
* shnbsd-tdep.c: Rename to ...
* sh-nbsd-tdep.c: ... this.
* sparcnbsd-nat.c: Rename to ...
* sparc-nbsd-nat.c: ... this.
* sparcnbsd-tdep.c: Rename to ...
* sparc-nbsd-tdep.c: ... this.
* sparcobsd-tdep.c: Rename to ...
* sparc-obsd-tdep.c: ... this.
* sparc64fbsd-nat.c: Rename to ...
* sparc64-fbsd-nat.c: ... this.
* sparc64fbsd-tdep.c: Rename to ...
* sparc64-fbsd-tdep.c: ... this.
* sparc64nbsd-nat.c: Rename to ...
* sparc64-nbsd-nat.c: ... this.
* sparc64nbsd-tdep.c: Rename to ...
* sparc64-nbsd-tdep.c: ... this.
* sparc64obsd-nat.c: Rename to ...
* sparc64-obsd-nat.c: ... this.
* sparc64obsd-tdep.c: Rename to ...
* sparc64-obsd-tdep.c: ... this.
* sparc64-tdep.h: Update comments.
* vaxbsd-nat.c: Rename to ...
* vax-bsd-nat.c: ... this.
* vaxnbsd-tdep.c: Rename to ...
* vax-nbsd-tdep.c: ... this.
* vaxobsd-tdep.c: Rename to ...
* vax-obsd-tdep.c: ... this.
* x86bsd-nat.h: Rename to ...
* x86-bsd-nat.h: ... this, adjust include barrier and comment.
* x86bsd-nat.c: Rename to ...
* x86-bsd-nat.c: ... this, adjust include.
* configure.tgt: Update renamed files.
* config/alpha/fbsd.mh: Update renamed files.
* config/alpha/nbsd.mh: Update renamed files.
* config/arm/nbsdelf.mh: Update renamed files.
* config/djgpp/fnchange.lst: Update renamed files.
* config/i386/fbsd.mh: Update renamed files.
* config/i386/fbsd64.mh: Update renamed files.
* config/i386/i386gnu.mh: Update renamed files.
* config/i386/i386sol2.mh: Update renamed files.
* config/i386/nbsd64.mh: Update renamed files.
* config/i386/nbsdelf.mh: Update renamed files.
* config/i386/obsd.mh: Update renamed files.
* config/i386/obsd64.mh: Update renamed files.
* config/i386/sol2-64.mh: Update renamed files.
* config/m68k/linux.mh: Update renamed files.
* config/m68k/nbsdelf.mh: Update renamed files.
* config/m68k/obsd.mh: Update renamed files.
* config/m88k/obsd.mh: Update renamed files.
* config/mips/nbsd.mh: Update renamed files.
* config/mips/obsd64.mh: Update renamed files.
* config/pa/nbsd.mh: Update renamed files.
* config/pa/obsd.mh: Update renamed files.
* config/powerpc/fbsd.mh: Update renamed files.
* config/powerpc/nbsd.mh: Update renamed files.
* config/powerpc/obsd.mh: Update renamed files.
* config/sh/nbsd.mh: Update renamed files.
* config/sparc/fbsd.mh: Update renamed files.
* config/sparc/nbsd64.mh: Update renamed files.
* config/sparc/nbsdelf.mh: Update renamed files.
* config/sparc/obsd64.mh: Update renamed files.
* config/vax/nbsdelf.mh: Update renamed files.
* config/vax/obsd.mh: Update renamed files.
Diff:
---
gdb/ChangeLog | 184 +++++++++++++++++++++
gdb/Makefile.in | 204 ++++++++++++------------
gdb/{alphabsd-nat.c => alpha-bsd-nat.c} | 2 +-
gdb/{alphabsd-tdep.c => alpha-bsd-tdep.c} | 2 +-
gdb/{alphabsd-tdep.h => alpha-bsd-tdep.h} | 8 +-
gdb/{alphafbsd-tdep.c => alpha-fbsd-tdep.c} | 0
gdb/{alphanbsd-tdep.c => alpha-nbsd-tdep.c} | 2 +-
gdb/{alphaobsd-tdep.c => alpha-obsd-tdep.c} | 2 +-
gdb/{amd64bsd-nat.c => amd64-bsd-nat.c} | 2 +-
gdb/{amd64fbsd-nat.c => amd64-fbsd-nat.c} | 4 +-
gdb/{amd64fbsd-tdep.c => amd64-fbsd-tdep.c} | 2 +-
gdb/{amd64nbsd-nat.c => amd64-nbsd-nat.c} | 0
gdb/{amd64nbsd-tdep.c => amd64-nbsd-tdep.c} | 0
gdb/{amd64obsd-nat.c => amd64-obsd-nat.c} | 0
gdb/{amd64obsd-tdep.c => amd64-obsd-tdep.c} | 0
gdb/amd64-tdep.h | 6 +-
gdb/{armbsd-tdep.c => arm-bsd-tdep.c} | 0
gdb/{armnbsd-nat.c => arm-nbsd-nat.c} | 0
gdb/{armnbsd-tdep.c => arm-nbsd-tdep.c} | 0
gdb/{armobsd-tdep.c => arm-obsd-tdep.c} | 0
gdb/arm-tdep.h | 2 +-
gdb/config/alpha/fbsd.mh | 2 +-
gdb/config/alpha/nbsd.mh | 2 +-
gdb/config/arm/nbsdelf.mh | 2 +-
gdb/config/djgpp/fnchange.lst | 96 +++++------
gdb/config/i386/fbsd.mh | 4 +-
gdb/config/i386/fbsd64.mh | 4 +-
gdb/config/i386/i386gnu.mh | 2 +-
gdb/config/i386/i386sol2.mh | 2 +-
gdb/config/i386/nbsd64.mh | 2 +-
gdb/config/i386/nbsdelf.mh | 2 +-
gdb/config/i386/obsd.mh | 2 +-
gdb/config/i386/obsd64.mh | 2 +-
gdb/config/i386/sol2-64.mh | 2 +-
gdb/config/m68k/linux.mh | 2 +-
gdb/config/m68k/nbsdelf.mh | 2 +-
gdb/config/m68k/obsd.mh | 2 +-
gdb/config/m88k/obsd.mh | 2 +-
gdb/config/mips/nbsd.mh | 2 +-
gdb/config/mips/obsd64.mh | 2 +-
gdb/config/pa/nbsd.mh | 2 +-
gdb/config/pa/obsd.mh | 2 +-
gdb/config/powerpc/fbsd.mh | 2 +-
gdb/config/powerpc/nbsd.mh | 2 +-
gdb/config/powerpc/obsd.mh | 2 +-
gdb/config/sh/nbsd.mh | 2 +-
gdb/config/sparc/fbsd.mh | 2 +-
gdb/config/sparc/nbsd64.mh | 2 +-
gdb/config/sparc/nbsdelf.mh | 2 +-
gdb/config/sparc/obsd64.mh | 2 +-
gdb/config/vax/nbsdelf.mh | 2 +-
gdb/config/vax/obsd.mh | 2 +-
gdb/configure.tgt | 80 +++++-----
gdb/{hppabsd-tdep.c => hppa-bsd-tdep.c} | 2 +-
gdb/{hppabsd-tdep.h => hppa-bsd-tdep.h} | 6 +-
gdb/{hppanbsd-nat.c => hppa-nbsd-nat.c} | 0
gdb/{hppanbsd-tdep.c => hppa-nbsd-tdep.c} | 2 +-
gdb/{hppaobsd-nat.c => hppa-obsd-nat.c} | 0
gdb/{hppaobsd-tdep.c => hppa-obsd-tdep.c} | 2 +-
gdb/{i386bsd-nat.c => i386-bsd-nat.c} | 6 +-
gdb/{i386bsd-nat.h => i386-bsd-nat.h} | 6 +-
gdb/{i386bsd-tdep.c => i386-bsd-tdep.c} | 0
gdb/{i386fbsd-nat.c => i386-fbsd-nat.c} | 4 +-
gdb/{i386fbsd-tdep.c => i386-fbsd-tdep.c} | 2 +-
gdb/{i386fbsd-tdep.h => i386-fbsd-tdep.h} | 6 +-
gdb/{i386gnu-nat.c => i386-gnu-nat.c} | 0
gdb/{i386gnu-tdep.c => i386-gnu-tdep.c} | 0
gdb/{i386nbsd-nat.c => i386-nbsd-nat.c} | 2 +-
gdb/{i386nbsd-tdep.c => i386-nbsd-tdep.c} | 0
gdb/{i386obsd-nat.c => i386-obsd-nat.c} | 2 +-
gdb/{i386obsd-tdep.c => i386-obsd-tdep.c} | 0
gdb/i386-tdep.h | 2 +-
gdb/{i386v4-nat.c => i386-v4-nat.c} | 0
gdb/{m68kbsd-nat.c => m68k-bsd-nat.c} | 0
gdb/{m68kbsd-tdep.c => m68k-bsd-tdep.c} | 0
gdb/{m68klinux-nat.c => m68k-linux-nat.c} | 0
gdb/{m68klinux-tdep.c => m68k-linux-tdep.c} | 0
gdb/m68k-tdep.h | 2 +-
gdb/{m88kbsd-nat.c => m88k-bsd-nat.c} | 0
gdb/{mipsnbsd-nat.c => mips-nbsd-nat.c} | 2 +-
gdb/{mipsnbsd-tdep.c => mips-nbsd-tdep.c} | 2 +-
gdb/{mipsnbsd-tdep.h => mips-nbsd-tdep.h} | 6 +-
gdb/{mips64obsd-nat.c => mips64-obsd-nat.c} | 0
gdb/{mips64obsd-tdep.c => mips64-obsd-tdep.c} | 0
gdb/{ppcfbsd-nat.c => ppc-fbsd-nat.c} | 2 +-
gdb/{ppcfbsd-tdep.c => ppc-fbsd-tdep.c} | 2 +-
gdb/{ppcfbsd-tdep.h => ppc-fbsd-tdep.h} | 8 +-
gdb/{ppcnbsd-nat.c => ppc-nbsd-nat.c} | 2 +-
gdb/{ppcnbsd-tdep.c => ppc-nbsd-tdep.c} | 2 +-
gdb/{ppcnbsd-tdep.h => ppc-nbsd-tdep.h} | 6 +-
gdb/{ppcobsd-nat.c => ppc-obsd-nat.c} | 2 +-
gdb/{ppcobsd-tdep.c => ppc-obsd-tdep.c} | 2 +-
gdb/{ppcobsd-tdep.h => ppc-obsd-tdep.h} | 6 +-
gdb/{shnbsd-nat.c => sh-nbsd-nat.c} | 0
gdb/{shnbsd-tdep.c => sh-nbsd-tdep.c} | 0
gdb/{sparcnbsd-nat.c => sparc-nbsd-nat.c} | 0
gdb/{sparcnbsd-tdep.c => sparc-nbsd-tdep.c} | 0
gdb/{sparcobsd-tdep.c => sparc-obsd-tdep.c} | 0
gdb/{sparc64fbsd-nat.c => sparc64-fbsd-nat.c} | 0
gdb/{sparc64fbsd-tdep.c => sparc64-fbsd-tdep.c} | 0
gdb/{sparc64nbsd-nat.c => sparc64-nbsd-nat.c} | 0
gdb/{sparc64nbsd-tdep.c => sparc64-nbsd-tdep.c} | 0
gdb/{sparc64obsd-nat.c => sparc64-obsd-nat.c} | 0
gdb/{sparc64obsd-tdep.c => sparc64-obsd-tdep.c} | 0
gdb/sparc64-tdep.h | 4 +-
gdb/{vaxbsd-nat.c => vax-bsd-nat.c} | 0
gdb/{vaxnbsd-tdep.c => vax-nbsd-tdep.c} | 0
gdb/{vaxobsd-tdep.c => vax-obsd-tdep.c} | 0
gdb/{x86bsd-nat.c => x86-bsd-nat.c} | 2 +-
gdb/{x86bsd-nat.h => x86-bsd-nat.h} | 6 +-
110 files changed, 471 insertions(+), 287 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45c1eee..aae4e7a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,189 @@
2016-11-22 Simon Marchi <simon.marchi@polymtl.ca>
+ * Makefile.in (ALL_64_TARGET_OBS, ALL_TARGET_OBS,
+ HFILES_NO_SRCDIR, ALLDEPFILES): Rename files.
+ * alphabsd-nat.c: Rename to ...
+ * alpha-bsd-nat.c: ... this, adjust include.
+ * alphabsd-tdep.c: Rename to ...
+ * alpha-bsd-tdep.c: ... this, adjust include.
+ * alphabsd-tdep.h: Rename to ...
+ * alpha-bsd-tdep.h: ... this, adjust include barrier and comment.
+ * alphafbsd-tdep.c: Rename to ...
+ * alpha-fbsd-tdep.c: ... this.
+ * alphanbsd-tdep.c: Rename to ...
+ * alpha-nbsd-tdep.c: ... this, adjust include.
+ * alphaobsd-tdep.c: Rename to ...
+ * alpha-obsd-tdep.c: ... this, adjust include.
+ * amd64bsd-nat.c: Rename to ...
+ * amd64-bsd-nat.c: ... this, adjust include.
+ * amd64fbsd-nat.c: Rename to ...
+ * amd64-fbsd-nat.c: ... this, adjust include.
+ * amd64fbsd-tdep.c: Rename to ...
+ * amd64-fbsd-tdep.c: ... this, adjust include.
+ * amd64nbsd-nat.c: Rename to ...
+ * amd64-nbsd-nat.c: ... this.
+ * amd64nbsd-tdep.c: Rename to ...
+ * amd64-nbsd-tdep.c: ... this.
+ * amd64obsd-nat.c: Rename to ...
+ * amd64-obsd-nat.c: ... this.
+ * amd64obsd-tdep.c: Rename to ...
+ * amd64-obsd-tdep.c: ... this.
+ * amd64-tdep.h: Update comments.
+ * armbsd-tdep.c: Rename to ...
+ * arm-bsd-tdep.c: ... this.
+ * armnbsd-nat.c: Rename to ...
+ * arm-nbsd-nat.c: ... this.
+ * armnbsd-tdep.c: Rename to ...
+ * arm-nbsd-tdep.c: ... this.
+ * armobsd-tdep.c: Rename to ...
+ * arm-obsd-tdep.c: ... this.
+ * arm-tdep.h: Update comments.
+ * hppabsd-tdep.c: Rename to ...
+ * hppa-bsd-tdep.c: ... this, adjust include.
+ * hppabsd-tdep.h: Rename to ...
+ * hppa-bsd-tdep.h: ... this, adjust include barrier and comment.
+ * hppanbsd-nat.c: Rename to ...
+ * hppa-nbsd-nat.c: ... this.
+ * hppanbsd-tdep.c: Rename to ...
+ * hppa-nbsd-tdep.c: ... this, adjust include.
+ * hppaobsd-nat.c: Rename to ...
+ * hppa-obsd-nat.c: ... this.
+ * hppaobsd-tdep.c: Rename to ...
+ * hppa-obsd-tdep.c: ... this, adjust include.
+ * i386bsd-nat.c: Rename to ...
+ * i386-bsd-nat.c: ... this, adjust include.
+ * i386bsd-nat.h: Rename to ...
+ * i386-bsd-nat.h: ... this, adjust include barrier and comment.
+ * i386bsd-tdep.c: Rename to ...
+ * i386-bsd-tdep.c: ... this.
+ * i386fbsd-nat.c: Rename to ...
+ * i386-fbsd-nat.c: ... this, adjust include.
+ * i386fbsd-tdep.c: Rename to ...
+ * i386-fbsd-tdep.c: ... this, adjust include.
+ * i386fbsd-tdep.h: Rename to ...
+ * i386-fbsd-tdep.h: ... this, adjust include barrier and comment.
+ * i386gnu-nat.c: Rename to ...
+ * i386-gnu-nat.c: ... this.
+ * i386gnu-tdep.c: Rename to ...
+ * i386-gnu-tdep.c: ... this.
+ * i386nbsd-nat.c: Rename to ...
+ * i386-nbsd-nat.c: ... this, adjust include.
+ * i386nbsd-tdep.c: Rename to ...
+ * i386-nbsd-tdep.c: ... this.
+ * i386obsd-nat.c: Rename to ...
+ * i386-obsd-nat.c: ... this, adjust include.
+ * i386obsd-tdep.c: Rename to ...
+ * i386-obsd-tdep.c: ... this.
+ * i386v4-nat.c: Rename to ...
+ * i386-v4-nat.c: ... this.
+ * i386-tdep.h: Update comments.
+ * m68k-tdep.h: Update comments.
+ * m68kbsd-nat.c: Rename to ...
+ * m68k-bsd-nat.c: ... this.
+ * m68kbsd-tdep.c: Rename to ...
+ * m68k-bsd-tdep.c: ... this.
+ * m68klinux-nat.c: Rename to ...
+ * m68k-linux-nat.c: ... this.
+ * m68klinux-tdep.c: Rename to ...
+ * m68k-linux-tdep.c: ... this.
+ * m88kbsd-nat.c: Rename to ...
+ * m88k-bsd-nat.c: ... this.
+ * mipsnbsd-nat.c: Rename to ...
+ * mips-nbsd-nat.c: ... this, adjust include.
+ * mipsnbsd-tdep.c: Rename to ...
+ * mips-nbsd-tdep.c: ... this, adjust include.
+ * mipsnbsd-tdep.h: Rename to ...
+ * mips-nbsd-tdep.h: ... this, adjust include barrier and comment.
+ * mips64obsd-nat.c: Rename to ...
+ * mips64-obsd-nat.c: ... this.
+ * mips64obsd-tdep.c: Rename to ...
+ * mips64-obsd-tdep.c: ... this.
+ * ppcfbsd-nat.c: Rename to ...
+ * ppc-fbsd-nat.c: ... this, adjust include.
+ * ppcfbsd-tdep.c: Rename to ...
+ * ppc-fbsd-tdep.c: ... this, adjust include.
+ * ppcfbsd-tdep.h: Rename to ...
+ * ppc-fbsd-tdep.h: ... this, adjust include barrier and comment.
+ * ppcnbsd-nat.c: Rename to ...
+ * ppc-nbsd-nat.c: ... this, adjust include.
+ * ppcnbsd-tdep.c: Rename to ...
+ * ppc-nbsd-tdep.c: ... this, adjust include.
+ * ppcnbsd-tdep.h: Rename to ...
+ * ppc-nbsd-tdep.h: ... this, adjust include barrier and comment.
+ * ppcobsd-nat.c: Rename to ...
+ * ppc-obsd-nat.c: ... this, adjust include.
+ * ppcobsd-tdep.c: Rename to ...
+ * ppc-obsd-tdep.c: ... this, adjust include.
+ * ppcobsd-tdep.h: Rename to ...
+ * ppc-obsd-tdep.h: ... this, adjust include barrier and comment.
+ * shnbsd-nat.c: Rename to ...
+ * sh-nbsd-nat.c: ... this.
+ * shnbsd-tdep.c: Rename to ...
+ * sh-nbsd-tdep.c: ... this.
+ * sparcnbsd-nat.c: Rename to ...
+ * sparc-nbsd-nat.c: ... this.
+ * sparcnbsd-tdep.c: Rename to ...
+ * sparc-nbsd-tdep.c: ... this.
+ * sparcobsd-tdep.c: Rename to ...
+ * sparc-obsd-tdep.c: ... this.
+ * sparc64fbsd-nat.c: Rename to ...
+ * sparc64-fbsd-nat.c: ... this.
+ * sparc64fbsd-tdep.c: Rename to ...
+ * sparc64-fbsd-tdep.c: ... this.
+ * sparc64nbsd-nat.c: Rename to ...
+ * sparc64-nbsd-nat.c: ... this.
+ * sparc64nbsd-tdep.c: Rename to ...
+ * sparc64-nbsd-tdep.c: ... this.
+ * sparc64obsd-nat.c: Rename to ...
+ * sparc64-obsd-nat.c: ... this.
+ * sparc64obsd-tdep.c: Rename to ...
+ * sparc64-obsd-tdep.c: ... this.
+ * sparc64-tdep.h: Update comments.
+ * vaxbsd-nat.c: Rename to ...
+ * vax-bsd-nat.c: ... this.
+ * vaxnbsd-tdep.c: Rename to ...
+ * vax-nbsd-tdep.c: ... this.
+ * vaxobsd-tdep.c: Rename to ...
+ * vax-obsd-tdep.c: ... this.
+ * x86bsd-nat.h: Rename to ...
+ * x86-bsd-nat.h: ... this, adjust include barrier and comment.
+ * x86bsd-nat.c: Rename to ...
+ * x86-bsd-nat.c: ... this, adjust include.
+ * configure.tgt: Update renamed files.
+ * config/alpha/fbsd.mh: Update renamed files.
+ * config/alpha/nbsd.mh: Update renamed files.
+ * config/arm/nbsdelf.mh: Update renamed files.
+ * config/djgpp/fnchange.lst: Update renamed files.
+ * config/i386/fbsd.mh: Update renamed files.
+ * config/i386/fbsd64.mh: Update renamed files.
+ * config/i386/i386gnu.mh: Update renamed files.
+ * config/i386/i386sol2.mh: Update renamed files.
+ * config/i386/nbsd64.mh: Update renamed files.
+ * config/i386/nbsdelf.mh: Update renamed files.
+ * config/i386/obsd.mh: Update renamed files.
+ * config/i386/obsd64.mh: Update renamed files.
+ * config/i386/sol2-64.mh: Update renamed files.
+ * config/m68k/linux.mh: Update renamed files.
+ * config/m68k/nbsdelf.mh: Update renamed files.
+ * config/m68k/obsd.mh: Update renamed files.
+ * config/m88k/obsd.mh: Update renamed files.
+ * config/mips/nbsd.mh: Update renamed files.
+ * config/mips/obsd64.mh: Update renamed files.
+ * config/pa/nbsd.mh: Update renamed files.
+ * config/pa/obsd.mh: Update renamed files.
+ * config/powerpc/fbsd.mh: Update renamed files.
+ * config/powerpc/nbsd.mh: Update renamed files.
+ * config/powerpc/obsd.mh: Update renamed files.
+ * config/sh/nbsd.mh: Update renamed files.
+ * config/sparc/fbsd.mh: Update renamed files.
+ * config/sparc/nbsd64.mh: Update renamed files.
+ * config/sparc/nbsdelf.mh: Update renamed files.
+ * config/sparc/obsd64.mh: Update renamed files.
+ * config/vax/nbsdelf.mh: Update renamed files.
+ * config/vax/obsd.mh: Update renamed files.
+
+2016-11-22 Simon Marchi <simon.marchi@polymtl.ca>
+
* Makefile.in: Add comment about file lists ordering.
(SUBDIR_CLI_OBS, SUBDIR_CLI_SRCS, SUBDIR_MI_OBS, SUBDIR_MI_SRCS,
SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS, SUBDIR_GCC_COMPILE_OBS,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index af916aa..056b764 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -732,46 +732,46 @@ ALL_64_TARGET_OBS = \
aarch64-linux-tdep.o \
aarch64-newlib-tdep.o \
aarch64-tdep.o \
+ alpha-bsd-tdep.o \
+ alpha-fbsd-tdep.o \
alpha-linux-tdep.o \
alpha-mdebug-tdep.o \
+ alpha-nbsd-tdep.o \
+ alpha-obsd-tdep.o \
alpha-tdep.o \
- alphabsd-tdep.o \
- alphafbsd-tdep.o \
- alphanbsd-tdep.o \
- alphaobsd-tdep.o \
amd64-darwin-tdep.o \
amd64-dicos-tdep.o \
+ amd64-fbsd-tdep.o \
amd64-linux-tdep.o \
+ amd64-nbsd-tdep.o \
+ amd64-obsd-tdep.o \
amd64-sol2-tdep.o \
amd64-tdep.o \
amd64-windows-tdep.o \
- amd64fbsd-tdep.o \
- amd64nbsd-tdep.o \
- amd64obsd-tdep.o \
ia64-linux-tdep.o \
ia64-tdep.o \
ia64-vms-tdep.o \
- mips64obsd-tdep.o \
+ mips64-obsd-tdep.o \
+ sparc64-fbsd-tdep.o \
sparc64-linux-tdep.o \
+ sparc64-nbsd-tdep.o \
+ sparc64-obsd-tdep.o \
sparc64-sol2-tdep.o \
- sparc64-tdep.o \
- sparc64fbsd-tdep.o \
- sparc64nbsd-tdep.o \
- sparc64obsd-tdep.o
+ sparc64-tdep.o
# All other target-dependent objects files (used with --enable-targets=all).
ALL_TARGET_OBS = \
arc-tdep.o \
arm.o \
+ arm-bsd-tdep.o \
arm-get-next-pcs.o \
arm-linux.o \
arm-linux-tdep.o \
+ arm-nbsd-tdep.o \
+ arm-obsd-tdep.o \
arm-symbian-tdep.o \
arm-tdep.o \
arm-wince-tdep.o \
- armbsd-tdep.o \
- armnbsd-tdep.o \
- armobsd-tdep.o \
avr-tdep.o \
bfin-linux-tdep.o \
bfin-tdep.o \
@@ -785,23 +785,23 @@ ALL_TARGET_OBS = \
ft32-tdep.o \
glibc-tdep.o \
h8300-tdep.o \
+ hppa-bsd-tdep.o \
hppa-linux-tdep.o \
+ hppa-nbsd-tdep.o \
+ hppa-obsd-tdep.o \
hppa-tdep.o \
- hppabsd-tdep.o \
- hppanbsd-tdep.o \
- hppaobsd-tdep.o \
+ i386-bsd-tdep.o \
i386-cygwin-tdep.o \
i386-darwin-tdep.o \
i386-dicos-tdep.o \
+ i386-fbsd-tdep.o \
+ i386-gnu-tdep.o \
i386-linux-tdep.o \
+ i386-nbsd-tdep.o \
i386-nto-tdep.o \
+ i386-obsd-tdep.o \
i386-sol2-tdep.o \
i386-tdep.o \
- i386bsd-tdep.o \
- i386fbsd-tdep.o \
- i386gnu-tdep.o \
- i386nbsd-tdep.o \
- i386obsd-tdep.o \
i387-tdep.o \
iq2000-tdep.o \
linux-record.o \
@@ -811,17 +811,17 @@ ALL_TARGET_OBS = \
m32r-linux-tdep.o \
m32r-tdep.o \
m68hc11-tdep.o \
+ m68k-bsd-tdep.o \
+ m68k-linux-tdep.o \
m68k-tdep.o \
- m68kbsd-tdep.o \
- m68klinux-tdep.o \
m88k-tdep.o \
mep-tdep.o \
microblaze-linux-tdep.o \
microblaze-tdep.o \
mips-linux-tdep.o \
+ mips-nbsd-tdep.o \
mips-sde-tdep.o \
mips-tdep.o \
- mipsnbsd-tdep.o \
mn10300-linux-tdep.o \
mn10300-tdep.o \
moxie-tdep.o \
@@ -833,13 +833,13 @@ ALL_TARGET_OBS = \
nios2-tdep.o \
nto-tdep.o \
obsd-tdep.o \
+ ppc-fbsd-tdep.o \
ppc-linux-tdep.o \
+ ppc-nbsd-tdep.o \
+ ppc-obsd-tdep.o \
ppc-ravenscar-thread.o \
ppc-sysv-tdep.o \
ppc64-tdep.o \
- ppcfbsd-tdep.o \
- ppcnbsd-tdep.o \
- ppcobsd-tdep.o \
ravenscar-thread.o \
rl78-tdep.o \
rs6000-aix-tdep.o \
@@ -849,9 +849,9 @@ ALL_TARGET_OBS = \
s390-linux-tdep.o \
score-tdep.o \
sh-linux-tdep.o \
+ sh-nbsd-tdep.o \
sh-tdep.o \
sh64-tdep.o \
- shnbsd-tdep.o \
sol2-tdep.o \
solib-aix.o \
solib-darwin.o \
@@ -860,11 +860,11 @@ ALL_TARGET_OBS = \
solib-spu.o \
solib-svr4.o \
sparc-linux-tdep.o \
+ sparc-nbsd-tdep.o \
+ sparc-obsd-tdep.o \
sparc-ravenscar-thread.o \
sparc-sol2-tdep.o \
sparc-tdep.o \
- sparcnbsd-tdep.o \
- sparcobsd-tdep.o \
spu-multiarch.o \
spu-tdep.o \
symfile-mem.o \
@@ -873,9 +873,9 @@ ALL_TARGET_OBS = \
tilegx-linux-tdep.o \
tilegx-tdep.o \
v850-tdep.o \
+ vax-nbsd-tdep.o \
+ vax-obsd-tdep.o \
vax-tdep.o \
- vaxnbsd-tdep.o \
- vaxobsd-tdep.o \
windows-tdep.o \
xcoffread.o \
xstormy16-tdep.o \
@@ -1222,8 +1222,8 @@ HFILES_NO_SRCDIR = \
aarch64-tdep.h \
ada-lang.h \
addrmap.h \
+ alpha-bsd-tdep.h \
alpha-tdep.h \
- alphabsd-tdep.h \
amd64-darwin-tdep.h \
amd64-linux-tdep.h \
amd64-nat.h \
@@ -1312,14 +1312,14 @@ HFILES_NO_SRCDIR = \
gnu-nat.h \
go-lang.h \
gregset.h \
+ hppa-bsd-tdep.h \
hppa-linux-offsets.h \
hppa-tdep.h \
- hppabsd-tdep.h \
+ i386-bsd-nat.h \
i386-darwin-tdep.h \
i386-linux-nat.h \
i386-linux-tdep.h \
i386-tdep.h \
- i386bsd-nat.h \
i387-tdep.h \
ia64-libunwind-tdep.h \
ia64-tdep.h \
@@ -1353,8 +1353,8 @@ HFILES_NO_SRCDIR = \
memrange.h \
microblaze-tdep.h \
mips-linux-tdep.h \
+ mips-nbsd-tdep.h \
mips-tdep.h \
- mipsnbsd-tdep.h \
mn10300-tdep.h \
moxie-tdep.h \
nbsd-nat.h \
@@ -1370,13 +1370,13 @@ HFILES_NO_SRCDIR = \
osdata.h \
p-lang.h \
parser-defs.h \
+ ppc-fbsd-tdep.h \
ppc-linux-tdep.h \
+ ppc-nbsd-tdep.h \
+ ppc-obsd-tdep.h \
ppc-ravenscar-thread.h \
ppc-tdep.h \
ppc64-tdep.h \
- ppcfbsd-tdep.h \
- ppcnbsd-tdep.h \
- ppcobsd-tdep.h \
probe.h \
proc-utils.h \
procfs.h \
@@ -1448,9 +1448,9 @@ HFILES_NO_SRCDIR = \
vax-tdep.h \
windows-nat.h \
windows-tdep.h \
+ x86-bsd-nat.h \
x86-linux-nat.h \
x86-nat.h \
- x86bsd-nat.h \
xcoffread.h \
xml-support.h \
xml-syscall.h \
@@ -2433,41 +2433,41 @@ ALLDEPFILES = \
aarch64-newlib-tdep.c \
aarch64-tdep.c \
aix-thread.c \
+ alpha-bsd-nat.c \
+ alpha-bsd-tdep.c \
+ alpha-fbsd-tdep.c \
alpha-linux-nat.c \
alpha-linux-tdep.c \
alpha-mdebug-tdep.c \
+ alpha-nbsd-tdep.c \
+ alpha-obsd-tdep.c \
alpha-tdep.c \
- alphabsd-nat.c \
- alphabsd-tdep.c \
- alphafbsd-tdep.c \
- alphanbsd-tdep.c \
- alphaobsd-tdep.c \
+ amd64-bsd-nat.c \
amd64-darwin-tdep.c \
amd64-dicos-tdep.c \
+ amd64-fbsd-nat.c \
+ amd64-fbsd-tdep.c \
amd64-linux-nat.c \
amd64-linux-tdep.c \
amd64-nat.c \
+ amd64-nbsd-nat.c \
+ amd64-nbsd-tdep.c \
+ amd64-obsd-nat.c \
+ amd64-obsd-tdep.c \
amd64-sol2-tdep.c \
amd64-tdep.c \
- amd64bsd-nat.c \
- amd64fbsd-nat.c \
- amd64fbsd-tdep.c \
- amd64nbsd-nat.c \
- amd64nbsd-tdep.c \
- amd64obsd-nat.c \
- amd64obsd-tdep.c \
arc-tdep.c \
arm.c \
+ arm-bsd-tdep.c \
arm-get-next-pcs.c \
arm-linux.c \
arm-linux-nat.c \
arm-linux-tdep.c \
+ arm-nbsd-nat.c \
+ arm-nbsd-tdep.c \
+ arm-obsd-tdep.c \
arm-symbian-tdep.c \
arm-tdep.c \
- armbsd-tdep.c \
- armnbsd-nat.c \
- armnbsd-tdep.c \
- armobsd-tdep.c \
avr-tdep.c \
bfin-linux-tdep.c \
bfin-tdep.c \
@@ -2486,34 +2486,34 @@ ALLDEPFILES = \
glibc-tdep.c \
go32-nat.c \
h8300-tdep.c \
+ hppa-bsd-tdep.c \
hppa-linux-nat.c \
hppa-linux-tdep.c \
+ hppa-nbsd-nat.c \
+ hppa-nbsd-tdep.c \
+ hppa-obsd-nat.c \
+ hppa-obsd-tdep.c \
hppa-tdep.c \
- hppabsd-tdep.c \
- hppanbsd-nat.c \
- hppanbsd-tdep.c \
- hppaobsd-nat.c \
- hppaobsd-tdep.c \
+ i386-bsd-nat.c \
+ i386-bsd-tdep.c \
i386-cygwin-tdep.c \
i386-darwin-nat.c \
i386-darwin-tdep.c \
i386-dicos-tdep.c \
+ i386-fbsd-nat.c \
+ i386-fbsd-tdep.c \
+ i386-gnu-nat.c \
+ i386-gnu-tdep.c \
i386-linux-nat.c \
i386-linux-tdep.c \
+ i386-nbsd-nat.c \
+ i386-nbsd-tdep.c \
+ i386-obsd-nat.c \
+ i386-obsd-tdep.c \
i386-sol2-nat.c \
i386-sol2-tdep.c \
i386-tdep.c \
- i386bsd-nat.c \
- i386bsd-tdep.c \
- i386fbsd-nat.c \
- i386fbsd-tdep.c \
- i386gnu-nat.c \
- i386gnu-tdep.c \
- i386nbsd-nat.c \
- i386nbsd-tdep.c \
- i386obsd-nat.c \
- i386obsd-tdep.c \
- i386v4-nat.c \
+ i386-v4-nat.c \
i387-tdep.c \
ia64-libunwind-tdep.c \
ia64-linux-nat.c \
@@ -2529,24 +2529,24 @@ ALLDEPFILES = \
m32r-linux-tdep.c \
m32r-tdep.c \
m68hc11-tdep.c \
+ m68k-bsd-nat.c \
+ m68k-bsd-tdep.c \
+ m68k-linux-nat.c \
+ m68k-linux-tdep.c \
m68k-tdep.c \
- m68kbsd-nat.c \
- m68kbsd-tdep.c \
- m68klinux-nat.c \
- m68klinux-tdep.c \
+ m88k-bsd-nat.c \
m88k-tdep.c \
- m88kbsd-nat.c \
microblaze-linux-tdep.c \
microblaze-tdep.c \
mingw-hdep.c \
mips-linux-nat.c \
mips-linux-tdep.c \
+ mips-nbsd-nat.c \
+ mips-nbsd-tdep.c \
mips-sde-tdep.c \
mips-tdep.c \
- mips64obsd-nat.c \
- mips64obsd-tdep.c \
- mipsnbsd-nat.c \
- mipsnbsd-tdep.c \
+ mips64-obsd-nat.c \
+ mips64-obsd-tdep.c \
msp430-tdep.c \
nbsd-nat.c \
nbsd-tdep.c \
@@ -2556,17 +2556,17 @@ ALLDEPFILES = \
obsd-nat.c \
obsd-tdep.c \
posix-hdep.c \
+ ppc-fbsd-nat.c \
+ ppc-fbsd-tdep.c \
ppc-linux-nat.c \
ppc-linux-tdep.c \
+ ppc-nbsd-nat.c \
+ ppc-nbsd-tdep.c \
+ ppc-obsd-nat.c \
+ ppc-obsd-tdep.c \
ppc-ravenscar-thread.c \
ppc-sysv-tdep.c \
ppc64-tdep.c \
- ppcfbsd-nat.c \
- ppcfbsd-tdep.c \
- ppcnbsd-nat.c \
- ppcnbsd-tdep.c \
- ppcobsd-nat.c \
- ppcobsd-tdep.c \
procfs.c \
ravenscar-thread.c \
remote-sim.c \
@@ -2582,10 +2582,10 @@ ALLDEPFILES = \
ser-mingw.c \
ser-pipe.c \
ser-tcp.c \
+ sh-nbsd-nat.c \
+ sh-nbsd-tdep.c \
sh-tdep.c \
sh64-tdep.c \
- shnbsd-nat.c \
- shnbsd-tdep.c \
sol2-tdep.c \
solib-aix.c \
solib-spu.c \
@@ -2593,24 +2593,24 @@ ALLDEPFILES = \
sparc-linux-nat.c \
sparc-linux-tdep.c \
sparc-nat.c \
+ sparc-nbsd-nat.c \
+ sparc-nbsd-tdep.c \
+ sparc-obsd-tdep.c \
sparc-ravenscar-thread.c \
sparc-sol2-nat.c \
sparc-sol2-tdep.c \
sparc-tdep.c \
+ sparc64-fbsd-nat.c \
+ sparc64-fbsd-tdep.c \
sparc64-linux-nat.c \
sparc64-linux-tdep.c \
sparc64-nat.c \
+ sparc64-nbsd-nat.c \
+ sparc64-nbsd-tdep.c \
+ sparc64-obsd-nat.c \
+ sparc64-obsd-tdep.c \
sparc64-sol2-tdep.c \
sparc64-tdep.c \
- sparc64fbsd-nat.c \
- sparc64fbsd-tdep.c \
- sparc64nbsd-nat.c \
- sparc64nbsd-tdep.c \
- sparc64obsd-nat.c \
- sparc64obsd-tdep.c \
- sparcnbsd-nat.c \
- sparcnbsd-tdep.c \
- sparcobsd-tdep.c \
spu-linux-nat.c \
spu-multiarch.c \
spu-tdep.c \
@@ -2618,9 +2618,9 @@ ALLDEPFILES = \
tilegx-linux-tdep.c \
tilegx-tdep.c \
v850-tdep.c \
+ vax-bsd-nat.c \
+ vax-nbsd-tdep.c \
vax-tdep.c \
- vaxbsd-nat.c \
- vaxnbsd-tdep.c \
windows-nat.c \
windows-tdep.c \
x86-nat.c \
diff --git a/gdb/alphabsd-nat.c b/gdb/alpha-bsd-nat.c
similarity index 99%
rename from gdb/alphabsd-nat.c
rename to gdb/alpha-bsd-nat.c
index a7113df..1e58be3 100644
--- a/gdb/alphabsd-nat.c
+++ b/gdb/alpha-bsd-nat.c
@@ -22,7 +22,7 @@
#include "regcache.h"
#include "alpha-tdep.h"
-#include "alphabsd-tdep.h"
+#include "alpha-bsd-tdep.h"
#include "inf-ptrace.h"
#include <sys/types.h>
diff --git a/gdb/alphabsd-tdep.c b/gdb/alpha-bsd-tdep.c
similarity index 98%
rename from gdb/alphabsd-tdep.c
rename to gdb/alpha-bsd-tdep.c
index 5f531d9..ee868c7 100644
--- a/gdb/alphabsd-tdep.c
+++ b/gdb/alpha-bsd-tdep.c
@@ -21,7 +21,7 @@
#include "regcache.h"
#include "alpha-tdep.h"
-#include "alphabsd-tdep.h"
+#include "alpha-bsd-tdep.h"
/* Conviently, GDB uses the same register numbering as the
ptrace register structure used by BSD on Alpha. */
diff --git a/gdb/alphabsd-tdep.h b/gdb/alpha-bsd-tdep.h
similarity index 91%
rename from gdb/alphabsd-tdep.h
rename to gdb/alpha-bsd-tdep.h
index 1925735..4e042fd 100644
--- a/gdb/alphabsd-tdep.h
+++ b/gdb/alpha-bsd-tdep.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef ALPHABSD_TDEP_H
-#define ALPHABSD_TDEP_H
+#ifndef ALPHA_BSD_TDEP_H
+#define ALPHA_BSD_TDEP_H
struct regcache;
@@ -29,7 +29,7 @@ void alphabsd_supply_fpreg (struct regcache *, const char *, int);
void alphabsd_fill_fpreg (const struct regcache *, char *, int);
-/* Functions exported from alphanbsd-tdep.c. */
+/* Functions exported from alpha-nbsd-tdep.c. */
/* Iterate over supported core file register note sections. */
void alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
@@ -37,4 +37,4 @@ void alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
void *cb_data,
const struct regcache *regcache);
-#endif /* alphabsd-tdep.h */
+#endif /* alpha-bsd-tdep.h */
diff --git a/gdb/alphafbsd-tdep.c b/gdb/alpha-fbsd-tdep.c
similarity index 100%
rename from gdb/alphafbsd-tdep.c
rename to gdb/alpha-fbsd-tdep.c
diff --git a/gdb/alphanbsd-tdep.c b/gdb/alpha-nbsd-tdep.c
similarity index 99%
rename from gdb/alphanbsd-tdep.c
rename to gdb/alpha-nbsd-tdep.c
index abe3926..00ff481 100644
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alpha-nbsd-tdep.c
@@ -28,7 +28,7 @@
#include "value.h"
#include "alpha-tdep.h"
-#include "alphabsd-tdep.h"
+#include "alpha-bsd-tdep.h"
#include "nbsd-tdep.h"
#include "solib-svr4.h"
#include "target.h"
diff --git a/gdb/alphaobsd-tdep.c b/gdb/alpha-obsd-tdep.c
similarity index 99%
rename from gdb/alphaobsd-tdep.c
rename to gdb/alpha-obsd-tdep.c
index 9c04da0..98436f3 100644
--- a/gdb/alphaobsd-tdep.c
+++ b/gdb/alpha-obsd-tdep.c
@@ -24,7 +24,7 @@
#include "obsd-tdep.h"
#include "alpha-tdep.h"
-#include "alphabsd-tdep.h"
+#include "alpha-bsd-tdep.h"
#include "solib-svr4.h"
/* Signal trampolines. */
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64-bsd-nat.c
similarity index 99%
rename from gdb/amd64bsd-nat.c
rename to gdb/amd64-bsd-nat.c
index b87672a..4e6995c 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64-bsd-nat.c
@@ -31,7 +31,7 @@
#include "amd64-tdep.h"
#include "amd64-nat.h"
-#include "x86bsd-nat.h"
+#include "x86-bsd-nat.h"
#include "inf-ptrace.h"
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64-fbsd-nat.c
similarity index 98%
rename from gdb/amd64fbsd-nat.c
rename to gdb/amd64-fbsd-nat.c
index 66c374c..fce2699 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64-fbsd-nat.c
@@ -32,7 +32,7 @@
#include "fbsd-nat.h"
#include "amd64-tdep.h"
#include "amd64-nat.h"
-#include "x86bsd-nat.h"
+#include "x86-bsd-nat.h"
#include "x86-nat.h"
@@ -205,7 +205,7 @@ _initialize_amd64fbsd_nat (void)
/* Support debugging kernel virtual memory images. */
bsd_kvm_add_target (amd64fbsd_supply_pcb);
- /* To support the recognition of signal handlers, i386bsd-tdep.c
+ /* To support the recognition of signal handlers, i386-bsd-tdep.c
hardcodes some constants. Inclusion of this file means that we
are compiling a native debugger, which means that we can use the
system header files and sysctl(3) to get at the relevant
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c
similarity index 99%
rename from gdb/amd64fbsd-tdep.c
rename to gdb/amd64-fbsd-tdep.c
index dd71066..d3c4270 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64-fbsd-tdep.c
@@ -24,7 +24,7 @@
#include "regcache.h"
#include "osabi.h"
#include "regset.h"
-#include "i386fbsd-tdep.h"
+#include "i386-fbsd-tdep.h"
#include "x86-xstate.h"
#include "amd64-tdep.h"
diff --git a/gdb/amd64nbsd-nat.c b/gdb/amd64-nbsd-nat.c
similarity index 100%
rename from gdb/amd64nbsd-nat.c
rename to gdb/amd64-nbsd-nat.c
diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c
similarity index 100%
rename from gdb/amd64nbsd-tdep.c
rename to gdb/amd64-nbsd-tdep.c
diff --git a/gdb/amd64obsd-nat.c b/gdb/amd64-obsd-nat.c
similarity index 100%
rename from gdb/amd64obsd-nat.c
rename to gdb/amd64-obsd-nat.c
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64-obsd-tdep.c
similarity index 100%
rename from gdb/amd64obsd-tdep.c
rename to gdb/amd64-obsd-tdep.c
diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
index 2691e99..fa30648 100644
--- a/gdb/amd64-tdep.h
+++ b/gdb/amd64-tdep.h
@@ -128,13 +128,13 @@ extern const struct regset amd64_fpregset;
/* Variables exported from amd64-linux-tdep.c. */
extern int amd64_linux_gregset_reg_offset[];
-/* Variables exported from amd64nbsd-tdep.c. */
+/* Variables exported from amd64-nbsd-tdep.c. */
extern int amd64nbsd_r_reg_offset[];
-/* Variables exported from amd64obsd-tdep.c. */
+/* Variables exported from amd64-obsd-tdep.c. */
extern int amd64obsd_r_reg_offset[];
-/* Variables exported from amd64fbsd-tdep.c. */
+/* Variables exported from amd64-fbsd-tdep.c. */
extern CORE_ADDR amd64fbsd_sigtramp_start_addr;
extern CORE_ADDR amd64fbsd_sigtramp_end_addr;
extern int amd64fbsd_sc_reg_offset[];
diff --git a/gdb/armbsd-tdep.c b/gdb/arm-bsd-tdep.c
similarity index 100%
rename from gdb/armbsd-tdep.c
rename to gdb/arm-bsd-tdep.c
diff --git a/gdb/armnbsd-nat.c b/gdb/arm-nbsd-nat.c
similarity index 100%
rename from gdb/armnbsd-nat.c
rename to gdb/arm-nbsd-nat.c
diff --git a/gdb/armnbsd-tdep.c b/gdb/arm-nbsd-tdep.c
similarity index 100%
rename from gdb/armnbsd-tdep.c
rename to gdb/arm-nbsd-tdep.c
diff --git a/gdb/armobsd-tdep.c b/gdb/arm-obsd-tdep.c
similarity index 100%
rename from gdb/armobsd-tdep.c
rename to gdb/arm-obsd-tdep.c
diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h
index 6af44a9f..6fb417b 100644
--- a/gdb/arm-tdep.h
+++ b/gdb/arm-tdep.h
@@ -276,7 +276,7 @@ extern int arm_pc_is_thumb (struct gdbarch *, CORE_ADDR);
extern int arm_process_record (struct gdbarch *gdbarch,
struct regcache *regcache, CORE_ADDR addr);
-/* Functions exported from armbsd-tdep.h. */
+/* Functions exported from arm-bsd-tdep.h. */
/* Return the appropriate register set for the core section identified
by SECT_NAME and SECT_SIZE. */
diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
index 6d1fe29..9cd6912 100644
--- a/gdb/config/alpha/fbsd.mh
+++ b/gdb/config/alpha/fbsd.mh
@@ -1,6 +1,6 @@
# Host: FreeBSD/alpha
NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o alphabsd-nat.o bsd-kvm.o \
+ fbsd-nat.o alpha-bsd-nat.o bsd-kvm.o \
core-regset.o
LOADLIBES= -lkvm
diff --git a/gdb/config/alpha/nbsd.mh b/gdb/config/alpha/nbsd.mh
index b4185a7..a46739e 100644
--- a/gdb/config/alpha/nbsd.mh
+++ b/gdb/config/alpha/nbsd.mh
@@ -1,4 +1,4 @@
# Host: NetBSD/alpha
-NATDEPFILES= fork-child.o inf-ptrace.o alphabsd-nat.o bsd-kvm.o
+NATDEPFILES= fork-child.o inf-ptrace.o alpha-bsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/arm/nbsdelf.mh b/gdb/config/arm/nbsdelf.mh
index 4efb8a3..042b583 100644
--- a/gdb/config/arm/nbsdelf.mh
+++ b/gdb/config/arm/nbsdelf.mh
@@ -1,2 +1,2 @@
# Host: NetBSD/arm
-NATDEPFILES= fork-child.o inf-ptrace.o armnbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o arm-nbsd-nat.o
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index 21a8071..3addd67 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -118,21 +118,21 @@
@V@/gdb/ada-exp.tab.c @V@/gdb/ada-exp_tab.c
@V@/gdb/amd64-windows-nat.c @V@/gdb/a64w-nat.c
@V@/gdb/amd64-windows-tdep.c @V@/gdb/a64w-tdep.c
-@V@/gdb/amd64fbsd-nat.c @V@/gdb/a64fb-nat.c
-@V@/gdb/amd64fbsd-tdep.c @V@/gdb/a64fb-tdep.c
-@V@/gdb/amd64nbsd-nat.c @V@/gdb/a64nb-nat.c
-@V@/gdb/amd64nbsd-tdep.c @V@/gdb/a64nb-tdep.c
-@V@/gdb/amd64obsd-nat.c @V@/gdb/a64ob-nat.c
-@V@/gdb/amd64obsd-tdep.c @V@/gdb/a64ob-tdep.c
-@V@/gdb/alphabsd-nat.c @V@/gdb/alphb-nat.c
-@V@/gdb/alphabsd-tdep.c @V@/gdb/alphb-tdep.c
-@V@/gdb/alphanbsd-tdep.c @V@/gdb/alphnb-tdep.c
+@V@/gdb/amd64-fbsd-nat.c @V@/gdb/a64fb-nat.c
+@V@/gdb/amd64-fbsd-tdep.c @V@/gdb/a64fb-tdep.c
+@V@/gdb/amd64-nbsd-nat.c @V@/gdb/a64nb-nat.c
+@V@/gdb/amd64-nbsd-tdep.c @V@/gdb/a64nb-tdep.c
+@V@/gdb/amd64-obsd-nat.c @V@/gdb/a64ob-nat.c
+@V@/gdb/amd64-obsd-tdep.c @V@/gdb/a64ob-tdep.c
+@V@/gdb/alpha-bsd-nat.c @V@/gdb/alphb-nat.c
+@V@/gdb/alpha-bsd-tdep.c @V@/gdb/alphb-tdep.c
+@V@/gdb/alpha-nbsd-tdep.c @V@/gdb/alphnb-tdep.c
@V@/gdb/alpha-linux-nat.c @V@/gdb/alphl-nat.c
@V@/gdb/alpha-linux-tdep.c @V@/gdb/alphl-tdep.c
@V@/gdb/arm-linux-nat.c @V@/gdb/armlin-nat.c
@V@/gdb/arm-linux-tdep.c @V@/gdb/armlin-tdep.c
-@V@/gdb/armnbsd-nat.c @V@/gdb/armnbd-nat.c
-@V@/gdb/armnbsd-tdep.c @V@/gdb/armnbd-tdep.c
+@V@/gdb/arm-nbsd-nat.c @V@/gdb/armnbd-nat.c
+@V@/gdb/arm-nbsd-tdep.c @V@/gdb/armnbd-tdep.c
@V@/gdb/c-exp.tab.c @V@/gdb/c-exp_tab.c
@V@/gdb/config/alpha/tm-alphalinux.h @V@/gdb/config/alpha/tm-alplinux.h
@V@/gdb/config/i386/nm-cygwin64.h @V@/gdb/config/i386/nm-cyg64.h
@@ -276,23 +276,23 @@
@V@/gdb/gdbtk/library/ChangeLog-2000 @V@/gdb/gdbtk/library/ChangeLog.000
@V@/gdb/gdbtk/plugins/intel-pentium/intel-pentium.tcl.in @V@/gdb/gdbtk/plugins/intel-pentium/intel-pentium.t-in
@V@/gdb/gdbtk/plugins/rhabout/rhabout.tcl.in @V@/gdb/gdbtk/plugins/rhabout/rhabout.t-in
-@V@/gdb/hppabsd-nat.c @V@/gdb/hppab-nat.c
-@V@/gdb/hppabsd-tdep.c @V@/gdb/hppab-tdep.c
-@V@/gdb/hppnbsd-nat.c @V@/gdb/hppnb-nat.c
-@V@/gdb/hppnbsd-tdep.c @V@/gdb/hppnb-tdep.c
+@V@/gdb/hppa-bsd-nat.c @V@/gdb/hppab-nat.c
+@V@/gdb/hppa-bsd-tdep.c @V@/gdb/hppab-tdep.c
+@V@/gdb/hpp-nbsd-nat.c @V@/gdb/hppnb-nat.c
+@V@/gdb/hpp-nbsd-tdep.c @V@/gdb/hppnb-tdep.c
@V@/gdb/i386-darwin-nat.c @V@/gdb/i386dw-nat.c
@V@/gdb/i386-darwin-tdep.c @V@/gdb/i386dw-tdep.c
@V@/gdb/i386-linux-tdep.c @V@/gdb/i386lx-tdep.c
@V@/gdb/i386-linux-nat.c @V@/gdb/i386lx-nat.c
-@V@/gdb/i386bsd-nat.c @V@/gdb/i3bsd-nat.c
-@V@/gdb/i386bsd-tdep.c @V@/gdb/i3bsd-tdep.c
-@V@/gdb/i386fbsd-nat.c @V@/gdb/i3fbsd-nat.c
-@V@/gdb/i386fbsd-tdep.c @V@/gdb/i3fbsd-tdep.c
-@V@/gdb/i386gnu-nat.c @V@/gdb/i3gnu-nat.c
-@V@/gdb/i386gnu-tdep.c @V@/gdb/i3gnu-tdep.c
-@V@/gdb/i386nbsd-tdep.c @V@/gdb/i3nbsd-tdep.c
-@V@/gdb/i386obsd-nat.c @V@/gdb/i3obsd-nat.c
-@V@/gdb/i386obsd-tdep.c @V@/gdb/i3obsd-tdep.c
+@V@/gdb/i386-bsd-nat.c @V@/gdb/i3bsd-nat.c
+@V@/gdb/i386-bsd-tdep.c @V@/gdb/i3bsd-tdep.c
+@V@/gdb/i386-fbsd-nat.c @V@/gdb/i3fbsd-nat.c
+@V@/gdb/i386-fbsd-tdep.c @V@/gdb/i3fbsd-tdep.c
+@V@/gdb/i386-gnu-nat.c @V@/gdb/i3gnu-nat.c
+@V@/gdb/i386-gnu-tdep.c @V@/gdb/i3gnu-tdep.c
+@V@/gdb/i386-nbsd-tdep.c @V@/gdb/i3nbsd-tdep.c
+@V@/gdb/i386-obsd-nat.c @V@/gdb/i3obsd-nat.c
+@V@/gdb/i386-obsd-tdep.c @V@/gdb/i3obsd-tdep.c
@V@/gdb/i386-sol2-nat.c @V@/gdb/i3sol2-nat.c
@V@/gdb/i386-sol2-tdep.c @V@/gdb/i3sol2-tdep.c
@V@/gdb/ia64-aix-nat.c @V@/gdb/ia64ax-nat.c
@@ -303,33 +303,33 @@
@V@/gdb/m2-exp.tab.c @V@/gdb/m2-exp_tab.c
@V@/gdb/m32r-linux-nat.c @V@/gdb/m32rlnxnat.c
@V@/gdb/m32r-linux-tdep.c @V@/gdb/m32rlnxtdep.c
-@V@/gdb/m68klinux-nat.c @V@/gdb/m68kl-nat.c
-@V@/gdb/m68klinux-tdep.c @V@/gdb/m68kl-tdep.c
-@V@/gdb/m68kbsd-nat.c @V@/gdb/m68bsd-nat.c
-@V@/gdb/m68kbsd-tdep.c @V@/gdb/m68bsd-tdep.c
-@V@/gdb/m68knbsd-nat.c @V@/gdb/m6nbsd-nat.c
-@V@/gdb/m68knbsd-tdep.c @V@/gdb/m6nbsd-tdep.c
+@V@/gdb/m68k-linux-nat.c @V@/gdb/m68kl-nat.c
+@V@/gdb/m68k-linux-tdep.c @V@/gdb/m68kl-tdep.c
+@V@/gdb/m68k-bsd-nat.c @V@/gdb/m68bsd-nat.c
+@V@/gdb/m68k-bsd-tdep.c @V@/gdb/m68bsd-tdep.c
+@V@/gdb/m68k-nbsd-nat.c @V@/gdb/m6nbsd-nat.c
+@V@/gdb/m68k-nbsd-tdep.c @V@/gdb/m6nbsd-tdep.c
@V@/gdb/microblaze-rom.c @V@/gdb/mb-rom.c
@V@/gdb/microblaze-linux-tdep.c @V@/gdb/mbl-tdep.c
@V@/gdb/microblaze-tdep.h @V@/gdb/mb-tdep.h
@V@/gdb/microblaze-tdep.c @V@/gdb/mb-tdep.c
@V@/gdb/mips-linux-nat.c @V@/gdb/mipslnxnat.c
@V@/gdb/mips-linux-tdep.c @V@/gdb/mipslnxtdep.c
-@V@/gdb/mipsnbsd-nat.c @V@/gdb/mipsnbnat.c
-@V@/gdb/mipsnbsd-tdep.c @V@/gdb/mipsnbtdep.c
-@V@/gdb/mips64obsd-nat.c @V@/gdb/mipsobnat.c
-@V@/gdb/mips64obsd-tdep.c @V@/gdb/mipsobtdep.c
+@V@/gdb/mips-nbsd-nat.c @V@/gdb/mipsnbnat.c
+@V@/gdb/mips-nbsd-tdep.c @V@/gdb/mipsnbtdep.c
+@V@/gdb/mips64-obsd-nat.c @V@/gdb/mipsobnat.c
+@V@/gdb/mips64-obsd-tdep.c @V@/gdb/mipsobtdep.c
@V@/gdb/mn10300-linux-tdep.c @V@/gdb/mn10300linux-tdep.c
-@V@/gdb/ns32knbsd-nat.c @V@/gdb/ns32nb-nat.c
-@V@/gdb/ns32knbsd-tdep.c @V@/gdb/ns32nb-tdep.c
+@V@/gdb/ns32k-nbsd-nat.c @V@/gdb/ns32nb-nat.c
+@V@/gdb/ns32k-nbsd-tdep.c @V@/gdb/ns32nb-tdep.c
@V@/gdb/objc-exp.tab.c @V@/gdb/objc-exp_tab.c
@V@/gdb/p-exp.tab.c @V@/gdb/p-exp_tab.c
@V@/gdb/ppc-linux-tdep.c @V@/gdb/ppc-lx-tdep.c
@V@/gdb/ppc-linux-nat.c @V@/gdb/ppc-lx-nat.c
-@V@/gdb/ppcnbsd-nat.c @V@/gdb/ppcnb-nat.c
-@V@/gdb/ppcnbsd-tdep.c @V@/gdb/ppcnb-tdep.c
-@V@/gdb/ppcobsd-nat.c @V@/gdb/ppcob-nat.c
-@V@/gdb/ppcobsd-tdep.c @V@/gdb/ppcob-tdep.c
+@V@/gdb/ppc-nbsd-nat.c @V@/gdb/ppcnb-nat.c
+@V@/gdb/ppc-nbsd-tdep.c @V@/gdb/ppcnb-tdep.c
+@V@/gdb/ppc-obsd-nat.c @V@/gdb/ppcob-nat.c
+@V@/gdb/ppc-obsd-tdep.c @V@/gdb/ppcob-tdep.c
@V@/gdb/regformats/arm-with-vfpv2.dat @V@/gdb/regformats/arm-wv2.dat
@V@/gdb/regformats/arm-with-vfpv3.dat @V@/gdb/regformats/arm-wv3.dat
@V@/gdb/regformats/arm-with-iwmmxt.dat @V@/gdb/regformats/arm-iwmmxt.dat
@@ -373,17 +373,17 @@
@V@/gdb/remote-vx68.c @V@/gdb/rmt-vx68.c
@V@/gdb/remote-vxmips.c @V@/gdb/rmt-vxmips.c
@V@/gdb/remote-vxsparc.c @V@/gdb/rmt-vxsparc.c
-@V@/gdb/sparc64fbsd-nat.c @V@/gdb/sp64fb-nat.c
-@V@/gdb/sparc64fbsd-tdep.c @V@/gdb/sp64fb-tdep.c
-@V@/gdb/sparc64nbsd-nat.c @V@/gdb/sp64nb-nat.c
-@V@/gdb/sparc64nbsd-tdep.c @V@/gdb/sp64nb-tdep.c
+@V@/gdb/sparc64-fbsd-nat.c @V@/gdb/sp64fb-nat.c
+@V@/gdb/sparc64-fbsd-tdep.c @V@/gdb/sp64fb-tdep.c
+@V@/gdb/sparc64-nbsd-nat.c @V@/gdb/sp64nb-nat.c
+@V@/gdb/sparc64-nbsd-tdep.c @V@/gdb/sp64nb-tdep.c
@V@/gdb/sparc64-linux-nat.c @V@/gdb/sp64lx-nat.c
@V@/gdb/sparc64-linux-tdep.c @V@/gdb/sp64lx-tdep.c
@V@/gdb/sparc64-nat.c @V@/gdb/sp64-nat.c
@V@/gdb/sparc64-tdep.c @V@/gdb/sp64-tdep.c
@V@/gdb/sparc64-sol2-tdep.c @V@/gdb/sp64s2-tdep.c
-@V@/gdb/sparcnbsd-nat.c @V@/gdb/spnb-nat.c
-@V@/gdb/sparcnbsd-tdep.c @V@/gdb/spnb-tdep.c
+@V@/gdb/sparc-nbsd-nat.c @V@/gdb/spnb-nat.c
+@V@/gdb/sparc-nbsd-tdep.c @V@/gdb/spnb-tdep.c
@V@/gdb/sparc-linux-nat.c @V@/gdb/splx-nat.c
@V@/gdb/sparc-linux-tdep.c @V@/gdb/splx-tdep.c
@V@/gdb/sparc-sol2-nat.c @V@/gdb/spsol2-nat.c
@@ -513,8 +513,8 @@
@V@/gdb/amd64-linux-nat.c @V@/gdb/amd64-lnat.c
@V@/gdb/hppa-linux-tdep.c @V@/gdb/palnxtdep.c
@V@/gdb/hppa-linux-nat.c @V@/gdb/palnxnat.c
-@V@/gdb/hppanbsd-nat.c @V@/gdb/panbsd-nat.c
-@V@/gdb/hppanbsd-tdep.c @V@/gdb/panbsd-tdep.c
+@V@/gdb/hppa-nbsd-nat.c @V@/gdb/panbsd-nat.c
+@V@/gdb/hppa-nbsd-tdep.c @V@/gdb/panbsd-tdep.c
@V@/gdb/amd64-windows-nat.c @V@/gdb/amd64-wnat.c
@V@/gdb/amd64-windows-tdep.c @V@/gdb/amd64-wtdep.c
@V@/gdb/i386-windows-nat.c @V@/gdb/i386-wnat.c
diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
index 1db6660..69e0a8b 100644
--- a/gdb/config/i386/fbsd.mh
+++ b/gdb/config/i386/fbsd.mh
@@ -1,7 +1,7 @@
# Host: FreeBSD/i386
NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o x86-nat.o x86-dregs.o x86bsd-nat.o i386bsd-nat.o \
- i386fbsd-nat.o bsd-kvm.o
+ fbsd-nat.o x86-nat.o x86-dregs.o x86-bsd-nat.o i386-bsd-nat.o \
+ i386-fbsd-nat.o bsd-kvm.o
NAT_FILE= nm-fbsd.h
HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh
index e196c00..461ff9a 100644
--- a/gdb/config/i386/fbsd64.mh
+++ b/gdb/config/i386/fbsd64.mh
@@ -1,7 +1,7 @@
# Host: FreeBSD/amd64
NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o \
- bsd-kvm.o x86-nat.o x86-dregs.o x86bsd-nat.o
+ fbsd-nat.o amd64-nat.o amd64-bsd-nat.o amd64-fbsd-nat.o \
+ bsd-kvm.o x86-nat.o x86-dregs.o x86-bsd-nat.o
HAVE_NATIVE_GCORE_HOST = 1
LOADLIBES= -lkvm
diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
index f1c0c5f..24e817e 100644
--- a/gdb/config/i386/i386gnu.mh
+++ b/gdb/config/i386/i386gnu.mh
@@ -1,5 +1,5 @@
# Host: Intel 386 running the GNU Hurd
-NATDEPFILES= i386gnu-nat.o gnu-nat.o \
+NATDEPFILES= i386-gnu-nat.o gnu-nat.o \
x86-nat.o x86-dregs.o fork-child.o \
notify_S.o process_reply_S.o msg_reply_S.o \
msg_U.o exc_request_U.o exc_request_S.o
diff --git a/gdb/config/i386/i386sol2.mh b/gdb/config/i386/i386sol2.mh
index 2f7c3c5..787a3c1 100644
--- a/gdb/config/i386/i386sol2.mh
+++ b/gdb/config/i386/i386sol2.mh
@@ -1,4 +1,4 @@
# Host: Solaris x86
-NATDEPFILES= fork-child.o i386v4-nat.o i386-sol2-nat.o \
+NATDEPFILES= fork-child.o i386-v4-nat.o i386-sol2-nat.o \
procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh
index 5fa369f..91d21f3 100644
--- a/gdb/config/i386/nbsd64.mh
+++ b/gdb/config/i386/nbsd64.mh
@@ -1,3 +1,3 @@
# Host: NetBSD/amd64
NATDEPFILES= fork-child.o inf-ptrace.o \
- nbsd-nat.o amd64-nat.o x86bsd-nat.o amd64bsd-nat.o amd64nbsd-nat.o
+ nbsd-nat.o amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index f8b9d6c..5954b3f 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,5 +1,5 @@
# Host: NetBSD/i386 ELF
NATDEPFILES= fork-child.o inf-ptrace.o \
- nbsd-nat.o x86bsd-nat.o i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o
+ nbsd-nat.o x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh
index 3845d26..fac7282 100644
--- a/gdb/config/i386/obsd.mh
+++ b/gdb/config/i386/obsd.mh
@@ -1,5 +1,5 @@
# Host: OpenBSD/i386 ELF
NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- x86bsd-nat.o i386bsd-nat.o i386obsd-nat.o bsd-kvm.o
+ x86-bsd-nat.o i386-bsd-nat.o i386-obsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/i386/obsd64.mh b/gdb/config/i386/obsd64.mh
index 2a8c42c..51deea7 100644
--- a/gdb/config/i386/obsd64.mh
+++ b/gdb/config/i386/obsd64.mh
@@ -1,5 +1,5 @@
# Host: OpenBSD/amd64
NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- amd64-nat.o x86bsd-nat.o amd64bsd-nat.o amd64obsd-nat.o bsd-kvm.o
+ amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-obsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/i386/sol2-64.mh b/gdb/config/i386/sol2-64.mh
index 7a8304d..7a3ab73 100644
--- a/gdb/config/i386/sol2-64.mh
+++ b/gdb/config/i386/sol2-64.mh
@@ -1,4 +1,4 @@
# Host: Solaris x86_64
-NATDEPFILES= fork-child.o amd64-nat.o i386v4-nat.o i386-sol2-nat.o \
+NATDEPFILES= fork-child.o amd64-nat.o i386-v4-nat.o i386-sol2-nat.o \
procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index 60d5ce4..7c1f4ac 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -2,7 +2,7 @@
NAT_FILE= config/nm-linux.h
NATDEPFILES= inf-ptrace.o fork-child.o \
- m68klinux-nat.o \
+ m68k-linux-nat.o \
proc-service.o linux-thread-db.o \
linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
linux-personality.o \
diff --git a/gdb/config/m68k/nbsdelf.mh b/gdb/config/m68k/nbsdelf.mh
index f2d97a1..1d00cbc 100644
--- a/gdb/config/m68k/nbsdelf.mh
+++ b/gdb/config/m68k/nbsdelf.mh
@@ -1,4 +1,4 @@
# Host: NetBSD/m68k ELF
-NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
+NATDEPFILES= m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
LOADLIBES= -lkvm
diff --git a/gdb/config/m68k/obsd.mh b/gdb/config/m68k/obsd.mh
index 7930e3b..902a24b 100644
--- a/gdb/config/m68k/obsd.mh
+++ b/gdb/config/m68k/obsd.mh
@@ -1,4 +1,4 @@
# Host: OpenBSD/m68k
-NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
+NATDEPFILES= m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
LOADLIBES= -lkvm
diff --git a/gdb/config/m88k/obsd.mh b/gdb/config/m88k/obsd.mh
index 2978edf..3c4d8d5 100644
--- a/gdb/config/m88k/obsd.mh
+++ b/gdb/config/m88k/obsd.mh
@@ -1,2 +1,2 @@
# Host: OpenBSD/m88k
-NATDEPFILES= fork-child.o inf-ptrace.o m88kbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o m88k-bsd-nat.o
diff --git a/gdb/config/mips/nbsd.mh b/gdb/config/mips/nbsd.mh
index b76df13..a80da95 100644
--- a/gdb/config/mips/nbsd.mh
+++ b/gdb/config/mips/nbsd.mh
@@ -1,2 +1,2 @@
# Host: NetBSD/mips
-NATDEPFILES= fork-child.o inf-ptrace.o mipsnbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o mips-nbsd-nat.o
diff --git a/gdb/config/mips/obsd64.mh b/gdb/config/mips/obsd64.mh
index ed04f9e..6aeac34 100644
--- a/gdb/config/mips/obsd64.mh
+++ b/gdb/config/mips/obsd64.mh
@@ -1,2 +1,2 @@
# Host: OpenBSD/mips64
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o mips64obsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o mips64-obsd-nat.o
diff --git a/gdb/config/pa/nbsd.mh b/gdb/config/pa/nbsd.mh
index 5cff698..791cd9f 100644
--- a/gdb/config/pa/nbsd.mh
+++ b/gdb/config/pa/nbsd.mh
@@ -1,2 +1,2 @@
# Host: NetBSD/hppa
-NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o hppanbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o hppa-nbsd-nat.o
diff --git a/gdb/config/pa/obsd.mh b/gdb/config/pa/obsd.mh
index 50a1192..95dd416 100644
--- a/gdb/config/pa/obsd.mh
+++ b/gdb/config/pa/obsd.mh
@@ -1,2 +1,2 @@
# Host: OpenBSD/hppa
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o hppaobsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o hppa-obsd-nat.o
diff --git a/gdb/config/powerpc/fbsd.mh b/gdb/config/powerpc/fbsd.mh
index 32ba4ae..3553acc 100644
--- a/gdb/config/powerpc/fbsd.mh
+++ b/gdb/config/powerpc/fbsd.mh
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. */
-NATDEPFILES= fbsd-nat.o fork-child.o inf-ptrace.o ppcfbsd-nat.o bsd-kvm.o
+NATDEPFILES= fbsd-nat.o fork-child.o inf-ptrace.o ppc-fbsd-nat.o bsd-kvm.o
HAVE_NATIVE_GCORE_HOST = 1
LOADLIBES= -lkvm
diff --git a/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh
index db0390c..f02a0f9 100644
--- a/gdb/config/powerpc/nbsd.mh
+++ b/gdb/config/powerpc/nbsd.mh
@@ -1,4 +1,4 @@
# Host: NetBSD/powerpc
-NATDEPFILES= fork-child.o inf-ptrace.o ppcnbsd-nat.o bsd-kvm.o
+NATDEPFILES= fork-child.o inf-ptrace.o ppc-nbsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/powerpc/obsd.mh b/gdb/config/powerpc/obsd.mh
index 2af667a..3743254 100644
--- a/gdb/config/powerpc/obsd.mh
+++ b/gdb/config/powerpc/obsd.mh
@@ -1,4 +1,4 @@
# Host: OpenBSD/powerpc
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o ppcobsd-nat.o bsd-kvm.o
+NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o ppc-obsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/sh/nbsd.mh b/gdb/config/sh/nbsd.mh
index d5e67cb..14d7e8c 100644
--- a/gdb/config/sh/nbsd.mh
+++ b/gdb/config/sh/nbsd.mh
@@ -1,2 +1,2 @@
# Host: NetBSD/sh
-NATDEPFILES= fork-child.o inf-ptrace.o shnbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o sh-nbsd-nat.o
diff --git a/gdb/config/sparc/fbsd.mh b/gdb/config/sparc/fbsd.mh
index 2774efb..bdc272c 100644
--- a/gdb/config/sparc/fbsd.mh
+++ b/gdb/config/sparc/fbsd.mh
@@ -1,6 +1,6 @@
# Host: FreeBSD/sparc64
NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64fbsd-nat.o \
+ fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64-fbsd-nat.o \
bsd-kvm.o
HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/config/sparc/nbsd64.mh b/gdb/config/sparc/nbsd64.mh
index 056b74d..aa15b1d 100644
--- a/gdb/config/sparc/nbsd64.mh
+++ b/gdb/config/sparc/nbsd64.mh
@@ -1,5 +1,5 @@
# Host: NetBSD/sparc64
NATDEPFILES= fork-child.o inf-ptrace.o \
- sparc64nbsd-nat.o sparc-nat.o bsd-kvm.o
+ sparc64-nbsd-nat.o sparc-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh
index 6bf898f..97d07b3 100644
--- a/gdb/config/sparc/nbsdelf.mh
+++ b/gdb/config/sparc/nbsdelf.mh
@@ -1,5 +1,5 @@
# Host: NetBSD/sparc ELF
NATDEPFILES= fork-child.o inf-ptrace.o \
- sparc-nat.o sparcnbsd-nat.o bsd-kvm.o
+ sparc-nat.o sparc-nbsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/sparc/obsd64.mh b/gdb/config/sparc/obsd64.mh
index d15e34d..e9f2fb9 100644
--- a/gdb/config/sparc/obsd64.mh
+++ b/gdb/config/sparc/obsd64.mh
@@ -1,5 +1,5 @@
# Host: OpenBSD/sparc64
NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- sparc64obsd-nat.o sparc-nat.o bsd-kvm.o
+ sparc64-obsd-nat.o sparc-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/vax/nbsdelf.mh b/gdb/config/vax/nbsdelf.mh
index dd9441b..bf0f0b9 100644
--- a/gdb/config/vax/nbsdelf.mh
+++ b/gdb/config/vax/nbsdelf.mh
@@ -1,5 +1,5 @@
# Host: NetBSD/vax ELF
NATDEPFILES= fork-child.o inf-ptrace.o \
- vaxbsd-nat.o bsd-kvm.o
+ vax-bsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/config/vax/obsd.mh b/gdb/config/vax/obsd.mh
index d4d444f..cef99d3 100644
--- a/gdb/config/vax/obsd.mh
+++ b/gdb/config/vax/obsd.mh
@@ -1,5 +1,5 @@
# Host: OpenBSD/vax
NATDEPFILES= fork-child.o inf-ptrace.o \
- vaxbsd-nat.o bsd-kvm.o
+ vax-bsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 79473c9..3a1ea6f 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -59,18 +59,18 @@ alpha*-*-linux*)
;;
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
# Target: FreeBSD/alpha
- gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
- alphafbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o \
+ alpha-fbsd-tdep.o solib-svr4.o"
;;
alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
# Target: NetBSD/alpha
- gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
- alphanbsd-tdep.o nbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o \
+ alpha-nbsd-tdep.o nbsd-tdep.o solib-svr4.o"
;;
alpha*-*-openbsd*)
# Target: OpenBSD/alpha
- gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
- alphanbsd-tdep.o alphaobsd-tdep.o nbsd-tdep.o \
+ gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o \
+ alpha-nbsd-tdep.o alpha-obsd-tdep.o nbsd-tdep.o \
obsd-tdep.o solib-svr4.o"
;;
alpha*-*-*)
@@ -109,13 +109,13 @@ arm*-*-linux*)
;;
arm*-*-netbsd* | arm*-*-knetbsd*-gnu)
# Target: NetBSD/arm
- gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o armnbsd-tdep.o \
+ gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o arm-nbsd-tdep.o \
solib-svr4.o"
;;
arm*-*-openbsd*)
# Target: OpenBSD/arm
- gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o armbsd-tdep.o \
- armobsd-tdep.o obsd-tdep.o solib-svr4.o"
+ gdb_target_obs="arm.o arm-get-next-pcs.o arm-tdep.o arm-bsd-tdep.o \
+ arm-obsd-tdep.o obsd-tdep.o solib-svr4.o"
;;
arm*-*-symbianelf*)
# Target: SymbianOS/arm
@@ -174,11 +174,11 @@ hppa*-*-linux*)
;;
hppa*-*-netbsd*)
# Target: NetBSD/hppa
- gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppanbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="hppa-tdep.o hppa-bsd-tdep.o hppa-nbsd-tdep.o solib-svr4.o"
;;
hppa*-*-openbsd*)
# Target: OpenBSD/hppa
- gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppaobsd-tdep.o solib-svr4.o"
+ gdb_target_obs="hppa-tdep.o hppa-bsd-tdep.o hppa-obsd-tdep.o solib-svr4.o"
;;
hppa*-*-*)
# Target: HP PA-RISC
@@ -200,17 +200,17 @@ i[34567]86-*-dicos*)
;;
i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
# Target: FreeBSD/i386
- gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+ gdb_target_obs="i386-tdep.o i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \
bsd-uthread.o fbsd-tdep.o solib-svr4.o"
;;
i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
# Target: NetBSD/i386
- gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o \
+ gdb_target_obs="i386-tdep.o i387-tdep.o i386-bsd-tdep.o i386-nbsd-tdep.o \
nbsd-tdep.o solib-svr4.o"
;;
i[34567]86-*-openbsd*)
# Target: OpenBSD/i386
- gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+ gdb_target_obs="i386-tdep.o i387-tdep.o i386-bsd-tdep.o i386-obsd-tdep.o \
obsd-tdep.o bsd-uthread.o solib-svr4.o"
;;
i[34567]86-*-nto*)
@@ -242,7 +242,7 @@ i[34567]86-*-linux*)
;;
i[34567]86-*-gnu*)
# Target: Intel 386 running the GNU Hurd
- gdb_target_obs="i386-tdep.o i387-tdep.o i386gnu-tdep.o solib-svr4.o"
+ gdb_target_obs="i386-tdep.o i387-tdep.o i386-gnu-tdep.o solib-svr4.o"
;;
i[34567]86-*-cygwin*)
# Target: Intel 386 running win32
@@ -321,17 +321,17 @@ fido-*-elf*)
;;
m68*-*-linux*)
# Target: Motorola m68k with a.out and ELF
- gdb_target_obs="m68k-tdep.o m68klinux-tdep.o solib-svr4.o \
+ gdb_target_obs="m68k-tdep.o m68k-linux-tdep.o solib-svr4.o \
linux-tdep.o glibc-tdep.o symfile-mem.o"
build_gdbserver=yes
;;
m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
# Target: NetBSD/m68k
- gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="m68k-tdep.o m68k-bsd-tdep.o solib-svr4.o"
;;
m68*-*-openbsd*)
# Target: OpenBSD/m68k
- gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="m68k-tdep.o m68k-bsd-tdep.o solib-svr4.o"
;;
m88*-*-openbsd*)
@@ -366,12 +366,12 @@ mips*-*-linux*)
;;
mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
# Target: MIPS running NetBSD
- gdb_target_obs="mips-tdep.o mipsnbsd-tdep.o solib-svr4.o nbsd-tdep.o"
+ gdb_target_obs="mips-tdep.o mips-nbsd-tdep.o solib-svr4.o nbsd-tdep.o"
gdb_sim=../sim/mips/libsim.a
;;
mips64*-*-openbsd*)
# Target: OpenBSD/mips64
- gdb_target_obs="mips-tdep.o mips64obsd-tdep.o obsd-tdep.o solib-svr4.o"
+ gdb_target_obs="mips-tdep.o mips64-obsd-tdep.o obsd-tdep.o solib-svr4.o"
;;
mips*-sde*-elf*)
# Target: MIPS SDE
@@ -424,20 +424,20 @@ nios2*-*-*)
powerpc*-*-freebsd*)
# Target: FreeBSD/powerpc
gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
- ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
+ ppc-fbsd-tdep.o fbsd-tdep.o solib-svr4.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
;;
powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
# Target: NetBSD/powerpc
- gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o \
+ gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc-nbsd-tdep.o \
solib-svr4.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
gdb_sim=../sim/ppc/libsim.a
;;
powerpc-*-openbsd*)
# Target: OpenBSD/powerpc
- gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcobsd-tdep.o \
+ gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc-obsd-tdep.o \
solib-svr4.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
;;
@@ -506,12 +506,12 @@ sh*-*-linux*)
;;
sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
# Target: NetBSD/sh
- gdb_target_obs="sh-tdep.o shnbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="sh-tdep.o sh-nbsd-tdep.o solib-svr4.o"
gdb_sim=../sim/sh/libsim.a
;;
sh*-*-openbsd*)
# Target: OpenBSD/sh
- gdb_target_obs="sh-tdep.o sh64-tdep.o shnbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="sh-tdep.o sh64-tdep.o sh-nbsd-tdep.o solib-svr4.o"
;;
sh64-*-elf*)
# Target: Renesas/Super-H 64 bit with simulator
@@ -547,32 +547,32 @@ sparc64-*-linux*)
;;
sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
# Target: FreeBSD/sparc64
- gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
+ gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64-fbsd-tdep.o \
fbsd-tdep.o solib-svr4.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
;;
sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
# Target: NetBSD/sparc
- gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
+ gdb_target_obs="sparc-tdep.o sparc-nbsd-tdep.o nbsd-tdep.o \
solib-svr4.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
;;
sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
# Target: NetBSD/sparc64
- gdb_target_obs="sparc64-tdep.o sparc64nbsd-tdep.o sparc-tdep.o \
- sparcnbsd-tdep.o nbsd-tdep.o solib-svr4.o \
+ gdb_target_obs="sparc64-tdep.o sparc64-nbsd-tdep.o sparc-tdep.o \
+ sparc-nbsd-tdep.o nbsd-tdep.o solib-svr4.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
;;
sparc-*-openbsd*)
# Target: OpenBSD/sparc
- gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
+ gdb_target_obs="sparc-tdep.o sparc-nbsd-tdep.o sparc-obsd-tdep.o \
nbsd-tdep.o obsd-tdep.o bsd-uthread.o solib-svr4.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
;;
sparc64-*-openbsd*)
# Target: OpenBSD/sparc64
- gdb_target_obs="sparc64-tdep.o sparc64nbsd-tdep.o sparc64obsd-tdep.o \
- sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
+ 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 \
nbsd-tdep.o obsd-tdep.o bsd-uthread.o solib-svr4.o \
ravenscar-thread.o sparc-ravenscar-thread.o"
;;
@@ -643,11 +643,11 @@ v850*-*-elf | v850*-*-rtems*)
vax-*-netbsd* | vax-*-knetbsd*-gnu)
# Target: NetBSD/vax
- gdb_target_obs="vax-tdep.o vaxnbsd-tdep.o solib-svr4.o"
+ gdb_target_obs="vax-tdep.o vax-nbsd-tdep.o solib-svr4.o"
;;
vax-*-openbsd*)
# Target: OpenBSD/vax
- gdb_target_obs="vax-tdep.o vaxobsd-tdep.o"
+ gdb_target_obs="vax-tdep.o vax-obsd-tdep.o"
;;
vax-*-*)
# Target: VAX
@@ -678,8 +678,8 @@ x86_64-*-linux*)
;;
x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
# Target: FreeBSD/amd64
- gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
- i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+ gdb_target_obs="amd64-tdep.o amd64-fbsd-tdep.o i386-tdep.o \
+ i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \
bsd-uthread.o fbsd-tdep.o solib-svr4.o"
;;
x86_64-*-mingw* | x86_64-*-cygwin*)
@@ -691,17 +691,17 @@ x86_64-*-mingw* | x86_64-*-cygwin*)
;;
x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
# Target: NetBSD/amd64
- gdb_target_obs="amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o \
+ gdb_target_obs="amd64-tdep.o amd64-nbsd-tdep.o i386-tdep.o i387-tdep.o \
nbsd-tdep.o solib-svr4.o"
;;
x86_64-*-openbsd*)
# Target: OpenBSD/amd64
- gdb_target_obs="amd64-tdep.o amd64obsd-tdep.o i386-tdep.o \
- i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+ gdb_target_obs="amd64-tdep.o amd64-obsd-tdep.o i386-tdep.o \
+ i387-tdep.o i386-bsd-tdep.o i386-obsd-tdep.o \
obsd-tdep.o bsd-uthread.o solib-svr4.o"
;;
x86_64-*-rtems*)
- gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o i386bsd-tdep.o"
+ gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o i386-bsd-tdep.o"
;;
xtensa*-*-linux*) gdb_target=linux
# Target: GNU/Linux Xtensa
diff --git a/gdb/hppabsd-tdep.c b/gdb/hppa-bsd-tdep.c
similarity index 99%
rename from gdb/hppabsd-tdep.c
rename to gdb/hppa-bsd-tdep.c
index a6feefb..2c581c4 100644
--- a/gdb/hppabsd-tdep.c
+++ b/gdb/hppa-bsd-tdep.c
@@ -25,7 +25,7 @@
#include "elf/common.h"
#include "hppa-tdep.h"
-#include "hppabsd-tdep.h"
+#include "hppa-bsd-tdep.h"
#include "dwarf2-frame.h"
#include "solib-svr4.h"
diff --git a/gdb/hppabsd-tdep.h b/gdb/hppa-bsd-tdep.h
similarity index 91%
rename from gdb/hppabsd-tdep.h
rename to gdb/hppa-bsd-tdep.h
index f9e8492..7d630a8 100644
--- a/gdb/hppabsd-tdep.h
+++ b/gdb/hppa-bsd-tdep.h
@@ -17,9 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef HPPABSD_TDEP_H
-#define HPPABSD_TDEP_H
+#ifndef HPPA_BSD_TDEP_H
+#define HPPA_BSD_TDEP_H
extern void hppabsd_init_abi (struct gdbarch_info, struct gdbarch *);
-#endif /* hppabsd-tdep.h */
+#endif /* hppa-bsd-tdep.h */
diff --git a/gdb/hppanbsd-nat.c b/gdb/hppa-nbsd-nat.c
similarity index 100%
rename from gdb/hppanbsd-nat.c
rename to gdb/hppa-nbsd-nat.c
diff --git a/gdb/hppanbsd-tdep.c b/gdb/hppa-nbsd-tdep.c
similarity index 99%
rename from gdb/hppanbsd-tdep.c
rename to gdb/hppa-nbsd-tdep.c
index 33d9ca8..6165bb5 100644
--- a/gdb/hppanbsd-tdep.c
+++ b/gdb/hppa-nbsd-tdep.c
@@ -26,7 +26,7 @@
#include "tramp-frame.h"
#include "hppa-tdep.h"
-#include "hppabsd-tdep.h"
+#include "hppa-bsd-tdep.h"
/* From <machine/mcontext.h>. */
static int hppanbsd_mc_reg_offset[] =
diff --git a/gdb/hppaobsd-nat.c b/gdb/hppa-obsd-nat.c
similarity index 100%
rename from gdb/hppaobsd-nat.c
rename to gdb/hppa-obsd-nat.c
diff --git a/gdb/hppaobsd-tdep.c b/gdb/hppa-obsd-tdep.c
similarity index 99%
rename from gdb/hppaobsd-tdep.c
rename to gdb/hppa-obsd-tdep.c
index ad914e1..65364fe 100644
--- a/gdb/hppaobsd-tdep.c
+++ b/gdb/hppa-obsd-tdep.c
@@ -23,7 +23,7 @@
#include "regset.h"
#include "hppa-tdep.h"
-#include "hppabsd-tdep.h"
+#include "hppa-bsd-tdep.h"
/* Core file support. */
diff --git a/gdb/i386bsd-nat.c b/gdb/i386-bsd-nat.c
similarity index 98%
rename from gdb/i386bsd-nat.c
rename to gdb/i386-bsd-nat.c
index b6b143b..492bd77 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386-bsd-nat.c
@@ -29,8 +29,8 @@
#include "i386-tdep.h"
#include "i387-tdep.h"
-#include "x86bsd-nat.h"
-#include "i386bsd-nat.h"
+#include "x86-bsd-nat.h"
+#include "i386-bsd-nat.h"
#include "inf-ptrace.h"
@@ -295,7 +295,7 @@ _initialize_i386bsd_nat (void)
{
int offset;
- /* To support the recognition of signal handlers, i386bsd-tdep.c
+ /* To support the recognition of signal handlers, i386-bsd-tdep.c
hardcodes some constants. Inclusion of this file means that we
are compiling a native debugger, which means that we can use the
system header files and sysctl(3) to get at the relevant
diff --git a/gdb/i386bsd-nat.h b/gdb/i386-bsd-nat.h
similarity index 92%
rename from gdb/i386bsd-nat.h
rename to gdb/i386-bsd-nat.h
index 1b51d19..a0291a0 100644
--- a/gdb/i386bsd-nat.h
+++ b/gdb/i386-bsd-nat.h
@@ -17,12 +17,12 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef I386BSD_NAT_H
-#define I386BSD_NAT_H
+#ifndef I386_BSD_NAT_H
+#define I386_BSD_NAT_H
/* Create a prototype *BSD/i386 target. The client can override it
with local methods. */
extern struct target_ops *i386bsd_target (void);
-#endif /* i386bsd-nat.h */
+#endif /* i386-bsd-nat.h */
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386-bsd-tdep.c
similarity index 100%
rename from gdb/i386bsd-tdep.c
rename to gdb/i386-bsd-tdep.c
diff --git a/gdb/i386fbsd-nat.c b/gdb/i386-fbsd-nat.c
similarity index 99%
rename from gdb/i386fbsd-nat.c
rename to gdb/i386-fbsd-nat.c
index 716b513..a9bf2b1 100644
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386-fbsd-nat.c
@@ -30,8 +30,8 @@
#include "fbsd-nat.h"
#include "i386-tdep.h"
#include "x86-nat.h"
-#include "x86bsd-nat.h"
-#include "i386bsd-nat.h"
+#include "x86-bsd-nat.h"
+#include "i386-bsd-nat.h"
/* Resume execution of the inferior process. If STEP is nonzero,
single-step it. If SIGNAL is nonzero, give it that signal. */
diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386-fbsd-tdep.c
similarity index 99%
rename from gdb/i386fbsd-tdep.c
rename to gdb/i386-fbsd-tdep.c
index fbff37c..a08523a 100644
--- a/gdb/i386fbsd-tdep.c
+++ b/gdb/i386-fbsd-tdep.c
@@ -23,7 +23,7 @@
#include "osabi.h"
#include "regcache.h"
#include "regset.h"
-#include "i386fbsd-tdep.h"
+#include "i386-fbsd-tdep.h"
#include "x86-xstate.h"
#include "i386-tdep.h"
diff --git a/gdb/i386fbsd-tdep.h b/gdb/i386-fbsd-tdep.h
similarity index 93%
rename from gdb/i386fbsd-tdep.h
rename to gdb/i386-fbsd-tdep.h
index c8ed1c1..70224e6 100644
--- a/gdb/i386fbsd-tdep.h
+++ b/gdb/i386-fbsd-tdep.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef I386FBSD_TDEP_H
-#define I386FBSD_TDEP_H
+#ifndef I386_FBSD_TDEP_H
+#define I386_FBSD_TDEP_H
/* Get XSAVE extended state xcr0 from core dump. */
extern uint64_t i386fbsd_core_read_xcr0 (bfd *abfd);
@@ -28,4 +28,4 @@ extern uint64_t i386fbsd_core_read_xcr0 (bfd *abfd);
matches the layout on Linux. */
#define I386_FBSD_XSAVE_XCR0_OFFSET 464
-#endif /* i386fbsd-tdep.h */
+#endif /* i386-fbsd-tdep.h */
diff --git a/gdb/i386gnu-nat.c b/gdb/i386-gnu-nat.c
similarity index 100%
rename from gdb/i386gnu-nat.c
rename to gdb/i386-gnu-nat.c
diff --git a/gdb/i386gnu-tdep.c b/gdb/i386-gnu-tdep.c
similarity index 100%
rename from gdb/i386gnu-tdep.c
rename to gdb/i386-gnu-tdep.c
diff --git a/gdb/i386nbsd-nat.c b/gdb/i386-nbsd-nat.c
similarity index 99%
rename from gdb/i386nbsd-nat.c
rename to gdb/i386-nbsd-nat.c
index 6ace1d4..ee5a13c 100644
--- a/gdb/i386nbsd-nat.c
+++ b/gdb/i386-nbsd-nat.c
@@ -23,7 +23,7 @@
#include "target.h"
#include "i386-tdep.h"
-#include "i386bsd-nat.h"
+#include "i386-bsd-nat.h"
/* Support for debugging kernel virtual memory images. */
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386-nbsd-tdep.c
similarity index 100%
rename from gdb/i386nbsd-tdep.c
rename to gdb/i386-nbsd-tdep.c
diff --git a/gdb/i386obsd-nat.c b/gdb/i386-obsd-nat.c
similarity index 99%
rename from gdb/i386obsd-nat.c
rename to gdb/i386-obsd-nat.c
index eeeee9a..42fedee 100644
--- a/gdb/i386obsd-nat.c
+++ b/gdb/i386-obsd-nat.c
@@ -27,7 +27,7 @@
#include <machine/pcb.h>
#include "i386-tdep.h"
-#include "i386bsd-nat.h"
+#include "i386-bsd-nat.h"
#include "obsd-nat.h"
#include "bsd-kvm.h"
diff --git a/gdb/i386obsd-tdep.c b/gdb/i386-obsd-tdep.c
similarity index 100%
rename from gdb/i386obsd-tdep.c
rename to gdb/i386-obsd-tdep.c
diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
index 49dcce0..672a6cf 100644
--- a/gdb/i386-tdep.h
+++ b/gdb/i386-tdep.h
@@ -428,7 +428,7 @@ extern const struct target_desc *i386_target_description (uint64_t xcr0);
extern int i386_mpx_enabled (void);
-/* Functions and variables exported from i386bsd-tdep.c. */
+/* Functions and variables exported from i386-bsd-tdep.c. */
extern void i386bsd_init_abi (struct gdbarch_info, struct gdbarch *);
extern CORE_ADDR i386fbsd_sigtramp_start_addr;
diff --git a/gdb/i386v4-nat.c b/gdb/i386-v4-nat.c
similarity index 100%
rename from gdb/i386v4-nat.c
rename to gdb/i386-v4-nat.c
diff --git a/gdb/m68kbsd-nat.c b/gdb/m68k-bsd-nat.c
similarity index 100%
rename from gdb/m68kbsd-nat.c
rename to gdb/m68k-bsd-nat.c
diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68k-bsd-tdep.c
similarity index 100%
rename from gdb/m68kbsd-tdep.c
rename to gdb/m68k-bsd-tdep.c
diff --git a/gdb/m68klinux-nat.c b/gdb/m68k-linux-nat.c
similarity index 100%
rename from gdb/m68klinux-nat.c
rename to gdb/m68k-linux-nat.c
diff --git a/gdb/m68klinux-tdep.c b/gdb/m68k-linux-tdep.c
similarity index 100%
rename from gdb/m68klinux-tdep.c
rename to gdb/m68k-linux-tdep.c
diff --git a/gdb/m68k-tdep.h b/gdb/m68k-tdep.h
index db03192..a3433e1 100644
--- a/gdb/m68k-tdep.h
+++ b/gdb/m68k-tdep.h
@@ -101,7 +101,7 @@ struct gdbarch_tdep
extern void m68k_svr4_init_abi (struct gdbarch_info, struct gdbarch *);
-/* Functions exported from m68kbsd-tdep.c. */
+/* Functions exported from m68k-bsd-tdep.c. */
extern int m68kbsd_fpreg_offset (struct gdbarch *gdbarch, int regnum);
diff --git a/gdb/m88kbsd-nat.c b/gdb/m88k-bsd-nat.c
similarity index 100%
rename from gdb/m88kbsd-nat.c
rename to gdb/m88k-bsd-nat.c
diff --git a/gdb/mipsnbsd-nat.c b/gdb/mips-nbsd-nat.c
similarity index 99%
rename from gdb/mipsnbsd-nat.c
rename to gdb/mips-nbsd-nat.c
index fc71592..ebbe84e 100644
--- a/gdb/mipsnbsd-nat.c
+++ b/gdb/mips-nbsd-nat.c
@@ -27,7 +27,7 @@
#include <machine/reg.h>
#include "mips-tdep.h"
-#include "mipsnbsd-tdep.h"
+#include "mips-nbsd-tdep.h"
#include "inf-ptrace.h"
/* Determine if PT_GETREGS fetches this register. */
diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mips-nbsd-tdep.c
similarity index 99%
rename from gdb/mipsnbsd-tdep.c
rename to gdb/mips-nbsd-tdep.c
index 4834995..2d7cd82 100644
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mips-nbsd-tdep.c
@@ -28,7 +28,7 @@
#include "osabi.h"
#include "nbsd-tdep.h"
-#include "mipsnbsd-tdep.h"
+#include "mips-nbsd-tdep.h"
#include "mips-tdep.h"
#include "solib-svr4.h"
diff --git a/gdb/mipsnbsd-tdep.h b/gdb/mips-nbsd-tdep.h
similarity index 93%
rename from gdb/mipsnbsd-tdep.h
rename to gdb/mips-nbsd-tdep.h
index 26f801c..caec0e1 100644
--- a/gdb/mipsnbsd-tdep.h
+++ b/gdb/mips-nbsd-tdep.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef MIPSNBSD_TDEP_H
-#define MIPSNBSD_TDEP_H
+#ifndef MIPS_NBSD_TDEP_H
+#define MIPS_NBSD_TDEP_H
void mipsnbsd_supply_reg (struct regcache *, const char *, int);
void mipsnbsd_fill_reg (const struct regcache *, char *, int);
@@ -26,4 +26,4 @@ void mipsnbsd_fill_reg (const struct regcache *, char *, int);
void mipsnbsd_supply_fpreg (struct regcache *, const char *, int);
void mipsnbsd_fill_fpreg (const struct regcache *, char *, int);
-#endif /* MIPSNBSD_TDEP_H */
+#endif /* MIPS_NBSD_TDEP_H */
diff --git a/gdb/mips64obsd-nat.c b/gdb/mips64-obsd-nat.c
similarity index 100%
rename from gdb/mips64obsd-nat.c
rename to gdb/mips64-obsd-nat.c
diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64-obsd-tdep.c
similarity index 100%
rename from gdb/mips64obsd-tdep.c
rename to gdb/mips64-obsd-tdep.c
diff --git a/gdb/ppcfbsd-nat.c b/gdb/ppc-fbsd-nat.c
similarity index 99%
rename from gdb/ppcfbsd-nat.c
rename to gdb/ppc-fbsd-nat.c
index 999e383..6eed998 100644
--- a/gdb/ppcfbsd-nat.c
+++ b/gdb/ppc-fbsd-nat.c
@@ -33,7 +33,7 @@
#include "fbsd-nat.h"
#include "gregset.h"
#include "ppc-tdep.h"
-#include "ppcfbsd-tdep.h"
+#include "ppc-fbsd-tdep.h"
#include "inf-ptrace.h"
#include "bsd-kvm.h"
diff --git a/gdb/ppcfbsd-tdep.c b/gdb/ppc-fbsd-tdep.c
similarity index 99%
rename from gdb/ppcfbsd-tdep.c
rename to gdb/ppc-fbsd-tdep.c
index 10b41b0..0e5ead6 100644
--- a/gdb/ppcfbsd-tdep.c
+++ b/gdb/ppc-fbsd-tdep.c
@@ -32,7 +32,7 @@
#include "ppc-tdep.h"
#include "ppc64-tdep.h"
-#include "ppcfbsd-tdep.h"
+#include "ppc-fbsd-tdep.h"
#include "fbsd-tdep.h"
#include "solib-svr4.h"
diff --git a/gdb/ppcfbsd-tdep.h b/gdb/ppc-fbsd-tdep.h
similarity index 89%
rename from gdb/ppcfbsd-tdep.h
rename to gdb/ppc-fbsd-tdep.h
index a51e5b7..9e1468b 100644
--- a/gdb/ppcfbsd-tdep.h
+++ b/gdb/ppc-fbsd-tdep.h
@@ -17,13 +17,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef PPCFBSD_TDEP_H
-#define PPCFBSD_TDEP_H
+#ifndef PPC_FBSD_TDEP_H
+#define PPC_FBSD_TDEP_H
struct regset;
-/* From ppcfbsd-tdep.c ... */
+/* From ppc-fbsd-tdep.c ... */
const struct regset *ppc_fbsd_gregset (int);
const struct regset *ppc_fbsd_fpregset (void);
-#endif /* PPCFBSD_TDEP_H */
+#endif /* PPC_FBSD_TDEP_H */
diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppc-nbsd-nat.c
similarity index 99%
rename from gdb/ppcnbsd-nat.c
rename to gdb/ppc-nbsd-nat.c
index cd0416f..5b1d141 100644
--- a/gdb/ppcnbsd-nat.c
+++ b/gdb/ppc-nbsd-nat.c
@@ -32,7 +32,7 @@
#include "regcache.h"
#include "ppc-tdep.h"
-#include "ppcnbsd-tdep.h"
+#include "ppc-nbsd-tdep.h"
#include "bsd-kvm.h"
#include "inf-ptrace.h"
diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppc-nbsd-tdep.c
similarity index 99%
rename from gdb/ppcnbsd-tdep.c
rename to gdb/ppc-nbsd-tdep.c
index be152e1..a730ebd 100644
--- a/gdb/ppcnbsd-tdep.c
+++ b/gdb/ppc-nbsd-tdep.c
@@ -28,7 +28,7 @@
#include "tramp-frame.h"
#include "ppc-tdep.h"
-#include "ppcnbsd-tdep.h"
+#include "ppc-nbsd-tdep.h"
#include "solib-svr4.h"
/* Register offsets from <machine/reg.h>. */
diff --git a/gdb/ppcnbsd-tdep.h b/gdb/ppc-nbsd-tdep.h
similarity index 93%
rename from gdb/ppcnbsd-tdep.h
rename to gdb/ppc-nbsd-tdep.h
index 25258ef..1e1f291 100644
--- a/gdb/ppcnbsd-tdep.h
+++ b/gdb/ppc-nbsd-tdep.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef PPCNBSD_TDEP_H
-#define PPCNBSD_TDEP_H
+#ifndef PPC_NBSD_TDEP_H
+#define PPC_NBSD_TDEP_H
struct regset;
@@ -29,4 +29,4 @@ extern struct ppc_reg_offsets ppcnbsd_reg_offsets;
extern const struct regset ppcnbsd_gregset;
extern const struct regset ppcnbsd_fpregset;
-#endif /* ppcnbsd-tdep.h */
+#endif /* ppc-nbsd-tdep.h */
diff --git a/gdb/ppcobsd-nat.c b/gdb/ppc-obsd-nat.c
similarity index 99%
rename from gdb/ppcobsd-nat.c
rename to gdb/ppc-obsd-nat.c
index c8e82c3..eb39e7c 100644
--- a/gdb/ppcobsd-nat.c
+++ b/gdb/ppc-obsd-nat.c
@@ -30,7 +30,7 @@
#include <machine/reg.h>
#include "ppc-tdep.h"
-#include "ppcobsd-tdep.h"
+#include "ppc-obsd-tdep.h"
#include "inf-ptrace.h"
#include "obsd-nat.h"
#include "bsd-kvm.h"
diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppc-obsd-tdep.c
similarity index 99%
rename from gdb/ppcobsd-tdep.c
rename to gdb/ppc-obsd-tdep.c
index bc5a5a8..f61dd24 100644
--- a/gdb/ppcobsd-tdep.c
+++ b/gdb/ppc-obsd-tdep.c
@@ -29,7 +29,7 @@
#include "trad-frame.h"
#include "ppc-tdep.h"
-#include "ppcobsd-tdep.h"
+#include "ppc-obsd-tdep.h"
#include "solib-svr4.h"
/* Register offsets from <machine/reg.h>. */
diff --git a/gdb/ppcobsd-tdep.h b/gdb/ppc-obsd-tdep.h
similarity index 95%
rename from gdb/ppcobsd-tdep.h
rename to gdb/ppc-obsd-tdep.h
index 568e948..cca5a79 100644
--- a/gdb/ppcobsd-tdep.h
+++ b/gdb/ppc-obsd-tdep.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef PPCOBSD_TDEP_H
-#define PPCOBSD_TDEP_H
+#ifndef PPC_OBSD_TDEP_H
+#define PPC_OBSD_TDEP_H
struct regset;
struct regcache;
@@ -49,4 +49,4 @@ extern void ppcobsd_collect_gregset (const struct regset *regset,
const struct regcache *regcache,
int regnum, void *gregs, size_t len);
-#endif /* ppcobsd-tdep.h */
+#endif /* ppc-obsd-tdep.h */
diff --git a/gdb/shnbsd-nat.c b/gdb/sh-nbsd-nat.c
similarity index 100%
rename from gdb/shnbsd-nat.c
rename to gdb/sh-nbsd-nat.c
diff --git a/gdb/shnbsd-tdep.c b/gdb/sh-nbsd-tdep.c
similarity index 100%
rename from gdb/shnbsd-tdep.c
rename to gdb/sh-nbsd-tdep.c
diff --git a/gdb/sparcnbsd-nat.c b/gdb/sparc-nbsd-nat.c
similarity index 100%
rename from gdb/sparcnbsd-nat.c
rename to gdb/sparc-nbsd-nat.c
diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparc-nbsd-tdep.c
similarity index 100%
rename from gdb/sparcnbsd-tdep.c
rename to gdb/sparc-nbsd-tdep.c
diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparc-obsd-tdep.c
similarity index 100%
rename from gdb/sparcobsd-tdep.c
rename to gdb/sparc-obsd-tdep.c
diff --git a/gdb/sparc64fbsd-nat.c b/gdb/sparc64-fbsd-nat.c
similarity index 100%
rename from gdb/sparc64fbsd-nat.c
rename to gdb/sparc64-fbsd-nat.c
diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64-fbsd-tdep.c
similarity index 100%
rename from gdb/sparc64fbsd-tdep.c
rename to gdb/sparc64-fbsd-tdep.c
diff --git a/gdb/sparc64nbsd-nat.c b/gdb/sparc64-nbsd-nat.c
similarity index 100%
rename from gdb/sparc64nbsd-nat.c
rename to gdb/sparc64-nbsd-nat.c
diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64-nbsd-tdep.c
similarity index 100%
rename from gdb/sparc64nbsd-tdep.c
rename to gdb/sparc64-nbsd-tdep.c
diff --git a/gdb/sparc64obsd-nat.c b/gdb/sparc64-obsd-nat.c
similarity index 100%
rename from gdb/sparc64obsd-nat.c
rename to gdb/sparc64-obsd-nat.c
diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64-obsd-tdep.c
similarity index 100%
rename from gdb/sparc64obsd-tdep.c
rename to gdb/sparc64-obsd-tdep.c
diff --git a/gdb/sparc64-tdep.h b/gdb/sparc64-tdep.h
index 9140264..eb925df 100644
--- a/gdb/sparc64-tdep.h
+++ b/gdb/sparc64-tdep.h
@@ -119,12 +119,12 @@ extern const struct sparc_fpregmap sparc64_sol2_fpregmap;
extern void sparc64_sol2_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch);
-/* Variables exported from sparc64fbsd-tdep.c. */
+/* Variables exported from sparc64-fbsd-tdep.c. */
/* Register offsets for FreeBSD/sparc64. */
extern const struct sparc_gregmap sparc64fbsd_gregmap;
-/* Functions and variables exported from sparc64nbsd-tdep.c. */
+/* Functions and variables exported from sparc64-nbsd-tdep.c. */
/* Register offsets for NetBSD/sparc64. */
extern const struct sparc_gregmap sparc64nbsd_gregmap;
diff --git a/gdb/vaxbsd-nat.c b/gdb/vax-bsd-nat.c
similarity index 100%
rename from gdb/vaxbsd-nat.c
rename to gdb/vax-bsd-nat.c
diff --git a/gdb/vaxnbsd-tdep.c b/gdb/vax-nbsd-tdep.c
similarity index 100%
rename from gdb/vaxnbsd-tdep.c
rename to gdb/vax-nbsd-tdep.c
diff --git a/gdb/vaxobsd-tdep.c b/gdb/vax-obsd-tdep.c
similarity index 100%
rename from gdb/vaxobsd-tdep.c
rename to gdb/vax-obsd-tdep.c
diff --git a/gdb/x86bsd-nat.c b/gdb/x86-bsd-nat.c
similarity index 99%
rename from gdb/x86bsd-nat.c
rename to gdb/x86-bsd-nat.c
index bde25ab..1998476 100644
--- a/gdb/x86bsd-nat.c
+++ b/gdb/x86-bsd-nat.c
@@ -29,7 +29,7 @@
#include <machine/reg.h>
#include "x86-nat.h"
-#include "x86bsd-nat.h"
+#include "x86-bsd-nat.h"
#include "inf-ptrace.h"
diff --git a/gdb/x86bsd-nat.h b/gdb/x86-bsd-nat.h
similarity index 93%
rename from gdb/x86bsd-nat.h
rename to gdb/x86-bsd-nat.h
index 6d39697..a13ff48 100644
--- a/gdb/x86bsd-nat.h
+++ b/gdb/x86-bsd-nat.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef X86BSD_NAT_H
-#define X86BSD_NAT_H
+#ifndef X86_BSD_NAT_H
+#define X86_BSD_NAT_H
/* Low level x86 XSAVE info. */
extern size_t x86bsd_xsave_len;
@@ -28,4 +28,4 @@ extern size_t x86bsd_xsave_len;
extern struct target_ops *x86bsd_target (void);
-#endif /* x86bsd-nat.h */
+#endif /* x86-bsd-nat.h */