2004-09-03 Andrew Cagney <cagney@gnu.org>

	* config/vax/nm-obsd.h: Delete file.
	* config/vax/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
	* config/vax/nm-nbsd.h: Delete file.
	* config/vax/nm-nbsdaout.h: Include config/nm-nbsd.h.
	* config/vax/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/sh/nm-nbsd.h: Delete file.
	* config/sh/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/rs6000/nm-rs6000ly.h: Delete file.
	* config/djgpp/fnchange.lst: Do not rename nm-rs6000ly.h.
	* config/rs6000/rs6000lynx.mh (NAT_FILE): Set to config/nm-lynx.h.
	* config/powerpc/nm-obsd.h: Delete file.
	* config/powerpc/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
	* config/powerpc/nm-nbsd.h: Delete file.
	* config/powerpc/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/pa/nm-obsd.h: Delete file.
	* config/pa/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
	* config/mips/nm-nbsd.h: Delete file.
	* config/mips/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/m88k/nm-obsd.h: Delete file.
	* config/m88k/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
	* config/m68k/nm-nbsd.h: Delete file.
	* config/m68k/nm-nbsdaout.h: Include config/nm-nbsd.h.
	* config/m68k/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/i386/nm-nbsd.h: Delete file.
	* config/i386/nm-nbsdaout.h: Include config/nm-nbsd.h.
	* config/i386/obsd64.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/i386/nbsd64.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/i386/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
	* config/i386/nm-i386lynx.h: Delete file.
	* config/i386/i386lynx.mh (NAT_FILE): Set to config/nm-lynx.h.
	* config/arm/nm-nbsd.h: Delete file.
	* config/arm/nm-nbsdaout.h: Include config/nm-nbsd.h.
	* config/arm/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.

34 files changed, 53 insertions, 379 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2ea5603166..40c4423296b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,39 @@
 2004-09-03  Andrew Cagney  <cagney@gnu.org>
 
+	* config/vax/nm-obsd.h: Delete file.
+	* config/vax/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
+	* config/vax/nm-nbsd.h: Delete file.
+	* config/vax/nm-nbsdaout.h: Include config/nm-nbsd.h.
+	* config/vax/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/sh/nm-nbsd.h: Delete file.
+	* config/sh/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/rs6000/nm-rs6000ly.h: Delete file.
+	* config/djgpp/fnchange.lst: Do not rename nm-rs6000ly.h.
+	* config/rs6000/rs6000lynx.mh (NAT_FILE): Set to config/nm-lynx.h.
+	* config/powerpc/nm-obsd.h: Delete file.
+	* config/powerpc/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
+	* config/powerpc/nm-nbsd.h: Delete file.
+	* config/powerpc/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/pa/nm-obsd.h: Delete file.
+	* config/pa/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
+	* config/mips/nm-nbsd.h: Delete file.
+	* config/mips/nbsd.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/m88k/nm-obsd.h: Delete file.
+	* config/m88k/obsd.mh (NAT_FILE): Set to config/nm-bsd.h.
+	* config/m68k/nm-nbsd.h: Delete file.
+	* config/m68k/nm-nbsdaout.h: Include config/nm-nbsd.h.
+	* config/m68k/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/i386/nm-nbsd.h: Delete file.
+	* config/i386/nm-nbsdaout.h: Include config/nm-nbsd.h.
+	* config/i386/obsd64.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/i386/nbsd64.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/i386/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
+	* config/i386/nm-i386lynx.h: Delete file.
+	* config/i386/i386lynx.mh (NAT_FILE): Set to config/nm-lynx.h.
+	* config/arm/nm-nbsd.h: Delete file.
+	* config/arm/nm-nbsdaout.h: Include config/nm-nbsd.h.
+	* config/arm/nbsdelf.mh (NAT_FILE): Set to config/nm-nbsd.h.
+
 	* config/i386/tm-fbsd.h: Delete file.
 	* config/i386/fbsd64.mt (TM_FILE): Set to solib.h.
 	* config/i386/fbsd.mt (TM_FILE): Set to solib.h.
diff --git a/gdb/config/arm/nbsdelf.mh b/gdb/config/arm/nbsdelf.mh
index 1746b42705d..b979f6ac125 100644
--- a/gdb/config/arm/nbsdelf.mh
+++ b/gdb/config/arm/nbsdelf.mh
@@ -1,3 +1,3 @@
 # Host ARM running NetBSD
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armnbsd-nat.o
-NAT_FILE=nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
diff --git a/gdb/config/arm/nm-nbsd.h b/gdb/config/arm/nm-nbsd.h
deleted file mode 100644
index 63be920092f..00000000000
--- a/gdb/config/arm/nm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Native-dependent definitions for ARM running NetBSD, for GDB.
-   Copyright 1986, 1987, 1989, 1992, 1994, 1999 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions. */
-#include "config/nm-nbsd.h"
-
-#endif /* NM_NBSD_H */
diff --git a/gdb/config/arm/nm-nbsdaout.h b/gdb/config/arm/nm-nbsdaout.h
index 3f7fee9de1a..88e42c5aeda 100644
--- a/gdb/config/arm/nm-nbsdaout.h
+++ b/gdb/config/arm/nm-nbsdaout.h
@@ -21,7 +21,7 @@
 #ifndef NM_NBSDAOUT_H
 #define NM_NBSDAOUT_H
 
-#include "arm/nm-nbsd.h"
+#include "config/nm-nbsd.h"
 
 /* Get generic NetBSD a.out native definitions. */
 #include "config/nm-nbsdaout.h"
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index 0c79741f6fc..4337b7261a0 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -99,7 +99,6 @@
 @V@/gdb/config/m88k/xm-delta88v4.h @V@/gdb/config/m88k/xm-d88v4.h
 @V@/gdb/config/mips/tm-linux.h @V@/gdb/config/mips/tm-lx.h
 @V@/gdb/config/pa/nm-hppah11.h @V@/gdb/config/pa/nm-hppa11.h
-@V@/gdb/config/rs6000/nm-rs6000ly.h @V@/gdb/config/rs6000/nm-rs6kly.h
 @V@/gdb/config/rs6000/tm-rs6000.h @V@/gdb/config/rs6000/tm-rs6k.h
 @V@/gdb/config/rs6000/tm-rs6000ly.h @V@/gdb/config/rs6000/tm-rs6kly.h
 @V@/gdb/config/sparc/tm-sparclynx.h @V@/gdb/config/sparc/tm-splynx.h
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index edfb1b0752b..2565057a5d7 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -2,5 +2,5 @@
 
 XM_CLIBS= -lbsd
 
-NAT_FILE= nm-i386lynx.h
+NAT_FILE= config/nm-lynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
diff --git a/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh
index abce1295784..32f82a2af1f 100644
--- a/gdb/config/i386/nbsd64.mh
+++ b/gdb/config/i386/nbsd64.mh
@@ -1,4 +1,4 @@
 # Host: NetBSD/amd64
 NATDEPFILES= fork-child.o infptrace.o inftarg.o \
 	amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index 13fecce7ed1..4f9a6fdef88 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,6 +1,6 @@
 # Host: NetBSD/i386 ELF
 NATDEPFILES= fork-child.o infptrace.o inftarg.o \
 	i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
deleted file mode 100644
index bc6a23410f2..00000000000
--- a/gdb/config/i386/nm-i386lynx.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Native-dependent definitions for Intel 386 running LynxOS.
-   Copyright 1993 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_I386LYNX_H
-#define NM_I386LYNX_H
-
-#include "config/nm-lynx.h"
-
-#endif /* NM_I386LYNX_H */
diff --git a/gdb/config/i386/nm-nbsd.h b/gdb/config/i386/nm-nbsd.h
deleted file mode 100644
index fef50f37bf5..00000000000
--- a/gdb/config/i386/nm-nbsd.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Native-dependent definitions for NetBSD/i386.
-
-   Copyright 1986, 1987, 1989, 1992, 1994, 2000, 2002, 2004
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-#endif /* nm-nbsd.h */
diff --git a/gdb/config/i386/nm-nbsdaout.h b/gdb/config/i386/nm-nbsdaout.h
index 375a6a02d95..81866ff64ab 100644
--- a/gdb/config/i386/nm-nbsdaout.h
+++ b/gdb/config/i386/nm-nbsdaout.h
@@ -23,7 +23,7 @@
 #ifndef NM_NBSDAOUT_H
 #define NM_NBSDAOUT_H
 
-#include "i386/nm-nbsd.h"
+#include "config/nm-nbsd.h"
 
 /* Get generic NetBSD a.out native definitions.  */
 #include "config/nm-nbsdaout.h"
diff --git a/gdb/config/i386/obsd64.mh b/gdb/config/i386/obsd64.mh
index 60718b7501a..14d341c5a07 100644
--- a/gdb/config/i386/obsd64.mh
+++ b/gdb/config/i386/obsd64.mh
@@ -1,6 +1,6 @@
 # Host: OpenBSD/amd64
 NATDEPFILES= fork-child.o infptrace.o inftarg.o \
 	amd64-nat.o amd64bsd-nat.o amd64obsd-nat.o bsd-kvm.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/m68k/nbsdelf.mh b/gdb/config/m68k/nbsdelf.mh
index 1823f32c0ca..c243fd533b2 100644
--- a/gdb/config/m68k/nbsdelf.mh
+++ b/gdb/config/m68k/nbsdelf.mh
@@ -1,5 +1,5 @@
 # Host: NetBSD/m68k ELF
 NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
 
 LOADLIBES= -lkvm
\ No newline at end of file
diff --git a/gdb/config/m68k/nm-nbsd.h b/gdb/config/m68k/nm-nbsd.h
deleted file mode 100644
index 616daf163bf..00000000000
--- a/gdb/config/m68k/nm-nbsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for NetBSD/m68k.
-
-   Copyright 1996, 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-#endif /* nm-nbsd.h */
diff --git a/gdb/config/m68k/nm-nbsdaout.h b/gdb/config/m68k/nm-nbsdaout.h
index fc8b7eea0c9..e7415891657 100644
--- a/gdb/config/m68k/nm-nbsdaout.h
+++ b/gdb/config/m68k/nm-nbsdaout.h
@@ -22,7 +22,7 @@
 #ifndef NM_NBSDAOUT_H
 #define NM_NBSDAOUT_H
 
-#include "m68k/nm-nbsd.h"
+#include "config/nm-nbsd.h"
 
 /* Get generic NetBSD a.out native definitions.  */
 #include "config/nm-nbsdaout.h"
diff --git a/gdb/config/m88k/nm-obsd.h b/gdb/config/m88k/nm-obsd.h
deleted file mode 100644
index 6d81f58c9d9..00000000000
--- a/gdb/config/m88k/nm-obsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for OpenBSD/m88k.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-#endif /* nm-obsd.h */
diff --git a/gdb/config/m88k/obsd.mh b/gdb/config/m88k/obsd.mh
index de60ab49e6a..e9281bcecd7 100644
--- a/gdb/config/m88k/obsd.mh
+++ b/gdb/config/m88k/obsd.mh
@@ -1,3 +1,3 @@
 # Host: OpenBSD/m88k
 NATDEPFILES= m88kbsd-nat.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-obsd.h
+NAT_FILE= config/nm-bsd.h
diff --git a/gdb/config/mips/nbsd.mh b/gdb/config/mips/nbsd.mh
index 4556fc60b27..5209d29bf39 100644
--- a/gdb/config/mips/nbsd.mh
+++ b/gdb/config/mips/nbsd.mh
@@ -1,4 +1,4 @@
 # Host: MIPS running NetBSD
 NAT_CLIBS=
 NATDEPFILES= infptrace.o inftarg.o fork-child.o mipsnbsd-nat.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
diff --git a/gdb/config/mips/nm-nbsd.h b/gdb/config/mips/nm-nbsd.h
deleted file mode 100644
index 67628c2fa97..00000000000
--- a/gdb/config/mips/nm-nbsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for NetBSD/mips.
-   Copyright 2002 Free Software Foundation, Inc.
-   Contributed by Wasabi Systems, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-#endif /* NM_NBSD_H */
diff --git a/gdb/config/pa/nm-obsd.h b/gdb/config/pa/nm-obsd.h
deleted file mode 100644
index ba91594fbb0..00000000000
--- a/gdb/config/pa/nm-obsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for OpenBSD/hppa.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-#endif /* nm-obsd.h */
diff --git a/gdb/config/pa/obsd.mh b/gdb/config/pa/obsd.mh
index bc94246841e..2c3dba97f59 100644
--- a/gdb/config/pa/obsd.mh
+++ b/gdb/config/pa/obsd.mh
@@ -1,3 +1,3 @@
 # Host: OpenBSD/hppa
 NATDEPFILES= fork-child.o infptrace.o inftarg.o hppabsd-nat.o
-NAT_FILE= nm-obsd.h
+NAT_FILE= config/nm-bsd.h
diff --git a/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh
index 923b5f27c1b..6a5ce92e43e 100644
--- a/gdb/config/powerpc/nbsd.mh
+++ b/gdb/config/powerpc/nbsd.mh
@@ -1,5 +1,5 @@
 # Host: PowerPC, running NetBSD
 NATDEPFILES= fork-child.o infptrace.o inftarg.o ppcnbsd-nat.o bsd-kvm.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/powerpc/nm-nbsd.h b/gdb/config/powerpc/nm-nbsd.h
deleted file mode 100644
index 5de6c9a0d21..00000000000
--- a/gdb/config/powerpc/nm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Native-dependent definitions for PowerPC running NetBSD ELF, for GDB.
-   Copyright 2000, 2002 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions. */
-#include "config/nm-nbsd.h"
-
-#endif
diff --git a/gdb/config/powerpc/nm-obsd.h b/gdb/config/powerpc/nm-obsd.h
deleted file mode 100644
index e59834f39ab..00000000000
--- a/gdb/config/powerpc/nm-obsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for OpenBSD/powerpc.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-#endif /* nm-obsd.h */
diff --git a/gdb/config/powerpc/obsd.mh b/gdb/config/powerpc/obsd.mh
index a20575a82ff..0482d3d3c67 100644
--- a/gdb/config/powerpc/obsd.mh
+++ b/gdb/config/powerpc/obsd.mh
@@ -1,3 +1,3 @@
 # Host: OpenBSD/powerpc
 NATDEPFILES= ppcobsd-nat.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-obsd.h
+NAT_FILE= config/nm-bsd.h
diff --git a/gdb/config/rs6000/nm-rs6000ly.h b/gdb/config/rs6000/nm-rs6000ly.h
deleted file mode 100644
index 51d12f8ac70..00000000000
--- a/gdb/config/rs6000/nm-rs6000ly.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Native-dependent definitions for RS6000 running LynxOS.
-   Copyright 1993 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_RS6000LYNX_H
-#define NM_RS6000LYNX_H
-
-#include "config/nm-lynx.h"
-
-#endif /* NM_RS6000LYNX_H */
diff --git a/gdb/config/rs6000/rs6000lynx.mh b/gdb/config/rs6000/rs6000lynx.mh
index 096473f1a60..fbe4147f0a0 100644
--- a/gdb/config/rs6000/rs6000lynx.mh
+++ b/gdb/config/rs6000/rs6000lynx.mh
@@ -2,5 +2,5 @@
 
 XM_CLIBS= -lbsd
 
-NAT_FILE= nm-rs6000ly.h
+NAT_FILE= config/nm-lynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o xcoffread.o
diff --git a/gdb/config/sh/nbsd.mh b/gdb/config/sh/nbsd.mh
index dd677b60e4b..9c7cec9c5c0 100644
--- a/gdb/config/sh/nbsd.mh
+++ b/gdb/config/sh/nbsd.mh
@@ -1,4 +1,4 @@
 # Host: SuperH running NetBSD
 NAT_CLIBS=
 NATDEPFILES= infptrace.o inftarg.o fork-child.o shnbsd-nat.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
diff --git a/gdb/config/sh/nm-nbsd.h b/gdb/config/sh/nm-nbsd.h
deleted file mode 100644
index eb38d6b49ea..00000000000
--- a/gdb/config/sh/nm-nbsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for SuperH running NetBSD, for GDB.
-   Copyright 2002 Free Software Foundation, Inc.
-   Contributed by Wasabi Systems, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-#endif /* NM_NBSD_H */
diff --git a/gdb/config/vax/nbsdelf.mh b/gdb/config/vax/nbsdelf.mh
index eec03994504..06dda18f70a 100644
--- a/gdb/config/vax/nbsdelf.mh
+++ b/gdb/config/vax/nbsdelf.mh
@@ -1,5 +1,5 @@
 # Host: NetBSD/vax ELF
 NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= config/nm-nbsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/vax/nm-nbsd.h b/gdb/config/vax/nm-nbsd.h
deleted file mode 100644
index a9468659c47..00000000000
--- a/gdb/config/vax/nm-nbsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for NetBSD/vax.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-#endif /* nm-nbsd.h */
diff --git a/gdb/config/vax/nm-nbsdaout.h b/gdb/config/vax/nm-nbsdaout.h
index f611b9a497d..02504f5e984 100644
--- a/gdb/config/vax/nm-nbsdaout.h
+++ b/gdb/config/vax/nm-nbsdaout.h
@@ -22,7 +22,7 @@
 #ifndef NM_NBSDAOUT_H
 #define NM_NBSDAOUT_H
 
-#include "vax/nm-nbsd.h"
+#include "config/nm-nbsd.h"
 
 /* Get generic NetBSD a.out native definitions.  */
 #include "config/nm-nbsdaout.h"
diff --git a/gdb/config/vax/nm-obsd.h b/gdb/config/vax/nm-obsd.h
deleted file mode 100644
index ac44636408e..00000000000
--- a/gdb/config/vax/nm-obsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for OpenBSD/vax.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-#endif /* nm-obsd.h */
diff --git a/gdb/config/vax/obsd.mh b/gdb/config/vax/obsd.mh
index 299a38fd330..416f2c62d14 100644
--- a/gdb/config/vax/obsd.mh
+++ b/gdb/config/vax/obsd.mh
@@ -1,5 +1,5 @@
 # Host: OpenBSD/vax
 NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-obsd.h
+NAT_FILE= config/nm-bsd.h
 
 LOADLIBES= -lkvm