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

	* config/vax/nbsd.mt (TM_FILE): Set to solib.h.
	* config/vax/tm-nbsd.h: Delete file.
	* config/sparc/vxworks.mt (TM_FILE): Set to config/tm-vxworks.h.
	* config/sparc/tm-vxworks.h: Delete file.
	* config/sparc/nbsd.mt (TM_FILE): Set to solib.h.
	* config/sparc/tm-nbsd.h: Delete file.
	* config/sparc/linux64.mt (TM_FILE): Set to solib.h.
	* config/sparc/linux.mt (TM_FILE): Set to solib.h.
	* config/sparc/tm-linux.h: Delete file.
	* config/s390/s390.mt (TM_FILE): Set to config/tm-linux.h
	* config/s390/tm-linux.h: Delete file.
	* config/pa/obsd.mt (TM_FILE): Set to solib.h.
	* config/pa/tm-bsd.h: Delete file.
	* config/m68k/obsd.mt (TM_FILE): Set to solib.h.
	* config/m68k/tm-obsd.h: Delete file.
	* config/m68k/nbsd.mt (TM_FILE): Set to solib.h.
	* config/m68k/tm-nbsd.h: Delete file.
	* config/i386/vxworks.mt (TM_FILE): Set to config/tm-vxworks.h.
	* config/i386/tm-vxworks.h: Delete file.
	* config/i386/obsd64.mt (TM_FILE): Set to solib.h.
	* config/i386/obsd.mt (TM_FILE): Set to solib.h.
	* config/i386/nbsd64.mt (TM_FILE): Set to solib.h.
	* config/i386/nbsd.mt (TM_FILE): Set to solib.h.
	* config/i386/tm-nbsd.h: Delete file.
	* config/i386/i386lynx.mt (TM_FILE): Set to config/tm-lynx.h.
	* config/i386/tm-i386lynx.h: Delete file.
	* config/cris/cris.mt (TM_FILE): Set to solib.h.
	* config/cris/tm-cris.h: Delete file.

29 files changed, 45 insertions, 322 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 06e312d..c880c45 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,34 @@
 2004-09-02  Andrew Cagney  <cagney@gnu.org>
 
+	* config/vax/nbsd.mt (TM_FILE): Set to solib.h.
+	* config/vax/tm-nbsd.h: Delete file.
+	* config/sparc/vxworks.mt (TM_FILE): Set to config/tm-vxworks.h.
+	* config/sparc/tm-vxworks.h: Delete file.
+	* config/sparc/nbsd.mt (TM_FILE): Set to solib.h.
+	* config/sparc/tm-nbsd.h: Delete file.
+	* config/sparc/linux64.mt (TM_FILE): Set to solib.h.
+	* config/sparc/linux.mt (TM_FILE): Set to solib.h.
+	* config/sparc/tm-linux.h: Delete file.
+	* config/s390/s390.mt (TM_FILE): Set to config/tm-linux.h
+	* config/s390/tm-linux.h: Delete file.
+	* config/pa/obsd.mt (TM_FILE): Set to solib.h.
+	* config/pa/tm-bsd.h: Delete file.
+	* config/m68k/obsd.mt (TM_FILE): Set to solib.h.
+	* config/m68k/tm-obsd.h: Delete file.
+	* config/m68k/nbsd.mt (TM_FILE): Set to solib.h.
+	* config/m68k/tm-nbsd.h: Delete file.
+	* config/i386/vxworks.mt (TM_FILE): Set to config/tm-vxworks.h.
+	* config/i386/tm-vxworks.h: Delete file.
+	* config/i386/obsd64.mt (TM_FILE): Set to solib.h.
+	* config/i386/obsd.mt (TM_FILE): Set to solib.h.
+	* config/i386/nbsd64.mt (TM_FILE): Set to solib.h.
+	* config/i386/nbsd.mt (TM_FILE): Set to solib.h.
+	* config/i386/tm-nbsd.h: Delete file.
+	* config/i386/i386lynx.mt (TM_FILE): Set to config/tm-lynx.h.
+	* config/i386/tm-i386lynx.h: Delete file.
+	* config/cris/cris.mt (TM_FILE): Set to solib.h.
+	* config/cris/tm-cris.h: Delete file.
+
 	* configure.in: Let TM_FILE, XM_FILE and NAT_FILE specify a path.
 	* configure: Re-generate.
 	* config/arm/nbsd.mt (TM_FILE): Set to "solib.h".
diff --git a/gdb/config/cris/cris.mt b/gdb/config/cris/cris.mt
index 9304d36..9a9cf7b 100644
--- a/gdb/config/cris/cris.mt
+++ b/gdb/config/cris/cris.mt
@@ -1,2 +1,2 @@
 TDEPFILES= cris-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-cris.h
+TM_FILE= solib.h
diff --git a/gdb/config/cris/tm-cris.h b/gdb/config/cris/tm-cris.h
deleted file mode 100644
index c19b450..0000000
--- a/gdb/config/cris/tm-cris.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "solib.h"
diff --git a/gdb/config/i386/i386lynx.mt b/gdb/config/i386/i386lynx.mt
index 6704b43..30ad473 100644
--- a/gdb/config/i386/i386lynx.mt
+++ b/gdb/config/i386/i386lynx.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running LynxOS
 TDEPFILES= coff-solib.o i386-tdep.o i386ly-tdep.o
-TM_FILE= tm-i386lynx.h
+TM_FILE= config/tm-lynx.h
diff --git a/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt
index d6699b5..ce82c3b 100644
--- a/gdb/config/i386/nbsd.mt
+++ b/gdb/config/i386/nbsd.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/i386
 TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt
index 3c98211..72eb556 100644
--- a/gdb/config/i386/nbsd64.mt
+++ b/gdb/config/i386/nbsd64.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/amd64
 TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/i386/obsd.mt b/gdb/config/i386/obsd.mt
index 58e0fc0..b8c40b8 100644
--- a/gdb/config/i386/obsd.mt
+++ b/gdb/config/i386/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/i386
 TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt
index e2bbf41..2b94e6f 100644
--- a/gdb/config/i386/obsd64.mt
+++ b/gdb/config/i386/obsd64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= amd64-tdep.o amd64obsd-tdep.o \
 	i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
deleted file mode 100644
index fbb7f81..0000000
--- a/gdb/config/i386/tm-i386lynx.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Macro definitions for Intel 386 running under LynxOS.
-
-   Copyright 1993, 1995, 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 TM_I386LYNX_H
-#define TM_I386LYNX_H
-
-#include "config/tm-lynx.h"
-
-#endif /* TM_I386LYNX_H */
diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
deleted file mode 100644
index 8fd4158..0000000
--- a/gdb/config/i386/tm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-dependent definitions for NetBSD/i386.
-
-   Copyright 1994, 1996, 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 TM_NBSD_H
-#define TM_NBSD_H
-
-#include "solib.h"
-
-#endif /* tm-nbsd.h */
diff --git a/gdb/config/i386/tm-vxworks.h b/gdb/config/i386/tm-vxworks.h
deleted file mode 100644
index c0a042e..0000000
--- a/gdb/config/i386/tm-vxworks.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Target machine description for VxWorks on the 80[3456]86, for GDB,
-   the GNU debugger.
-
-   Copyright 1999, 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 TM_VXWORKS_H
-#define TM_VXWORKS_H
-
-#include "config/tm-vxworks.h"
-
-#endif /* ifndef TM_VXWORKS_H */
diff --git a/gdb/config/i386/vxworks.mt b/gdb/config/i386/vxworks.mt
index a14aacc..f110db0 100644
--- a/gdb/config/i386/vxworks.mt
+++ b/gdb/config/i386/vxworks.mt
@@ -1,3 +1,3 @@
 # Target: i386 running VxWorks
 TDEPFILES= i386-tdep.o i387-tdep.o 
-TM_FILE= tm-vxworks.h
+TM_FILE= config/tm-vxworks.h
diff --git a/gdb/config/m68k/nbsd.mt b/gdb/config/m68k/nbsd.mt
index 1c77253..099c0e9 100644
--- a/gdb/config/m68k/nbsd.mt
+++ b/gdb/config/m68k/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: NetBSD/m68k
 TDEPFILES= m68k-tdep.o m68kbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/m68k/obsd.mt b/gdb/config/m68k/obsd.mt
index 7021c7f..18acf5e 100644
--- a/gdb/config/m68k/obsd.mt
+++ b/gdb/config/m68k/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/m68k
 TDEPFILES= m68k-tdep.o m68kbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-obsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/m68k/tm-nbsd.h b/gdb/config/m68k/tm-nbsd.h
deleted file mode 100644
index 6215cf6..0000000
--- a/gdb/config/m68k/tm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-dependent definitions for NetBSD/m68k.
-
-   Copyright 1994, 1996, 2001, 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 TM_NBSD_H
-#define TM_NBSD_H
-
-#include "solib.h"
-
-#endif /* tm-nbsd.h */
diff --git a/gdb/config/m68k/tm-obsd.h b/gdb/config/m68k/tm-obsd.h
deleted file mode 100644
index 993b49e..0000000
--- a/gdb/config/m68k/tm-obsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-dependent definitions for OpenBSD/m68k.
-
-   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 TM_OBSD_H
-#define TM_OBSD_H
-
-#include "solib.h"
-
-#endif /* tm-obsd.h */
diff --git a/gdb/config/pa/obsd.mt b/gdb/config/pa/obsd.mt
index 1b1df18..6366f64 100644
--- a/gdb/config/pa/obsd.mt
+++ b/gdb/config/pa/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/hppa
 TDEPFILES= hppa-tdep.o hppabsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-bsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/pa/tm-bsd.h b/gdb/config/pa/tm-bsd.h
deleted file mode 100644
index ebd5e9f..0000000
--- a/gdb/config/pa/tm-bsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Target-dependent definitions for HP PA-RISC BSD's.
-
-   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 TM_BSD_H
-#define TM_BSD_H
-
-/* Shared library support.  */
-#include "solib.h"
-
-#endif /* tm-bsd.h */
diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
index 86b6a33..2482dad 100644
--- a/gdb/config/s390/s390.mt
+++ b/gdb/config/s390/s390.mt
@@ -1,5 +1,5 @@
 # Target: S390 running Linux
-TM_FILE= tm-linux.h
+TM_FILE= config/tm-linux.h
 TDEPFILES=s390-tdep.o solib.o
 # Post 5.0 tdep-files
 TDEPFILES+=solib-svr4.o solib-legacy.o
diff --git a/gdb/config/s390/tm-linux.h b/gdb/config/s390/tm-linux.h
deleted file mode 100644
index d13d06d..0000000
--- a/gdb/config/s390/tm-linux.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Target definitions for GDB for a s390 running GNU/Linux.
-
-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
-
-   Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
-   for IBM Deutschland Entwicklung GmbH, IBM Corporation.
-
-   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 TM_LINUX_H
-#define TM_LINUX_H
-
-#include "config/tm-linux.h"
-
-#endif /* TM_LINUX_H */
diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt
index 442983b..43f1dad 100644
--- a/gdb/config/sparc/linux.mt
+++ b/gdb/config/sparc/linux.mt
@@ -1,4 +1,4 @@
 # Target: GNU/Linux SPARC
 TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
 	solib.o solib-svr4.o
-TM_FILE= tm-linux.h
+TM_FILE= solib.h
diff --git a/gdb/config/sparc/linux64.mt b/gdb/config/sparc/linux64.mt
index ba7c22e..91da9f0 100644
--- a/gdb/config/sparc/linux64.mt
+++ b/gdb/config/sparc/linux64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc64-linux-tdep.o \
 	sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
 	solib.o solib-svr4.o
-TM_FILE= tm-linux.h
+TM_FILE= solib.h
diff --git a/gdb/config/sparc/nbsd.mt b/gdb/config/sparc/nbsd.mt
index 25dbeff..34097a7 100644
--- a/gdb/config/sparc/nbsd.mt
+++ b/gdb/config/sparc/nbsd.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/sparc
 TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/sparc/tm-linux.h b/gdb/config/sparc/tm-linux.h
deleted file mode 100644
index 8cd0107..0000000
--- a/gdb/config/sparc/tm-linux.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-dependent definitions for GNU/Linux SPARC.
-
-   Copyright 2003 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef TM_LINUX_H
-#define TM_LINUX_H
-
-/* Shared library support.  */
-#include "solib.h"
-
-#endif /* tm-linux.h */
diff --git a/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h
deleted file mode 100644
index 149176e..0000000
--- a/gdb/config/sparc/tm-nbsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Target-dependent definitions for NetBSD/sparc.
-
-   Copyright 1994, 2002, 2003 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 TM_NBSD_H
-#define TM_NBSD_H
-
-/* Shared library support.  */
-#include "solib.h"
-
-#endif /* tm-nbsd.h */
diff --git a/gdb/config/sparc/tm-vxworks.h b/gdb/config/sparc/tm-vxworks.h
deleted file mode 100644
index 5b6d69c..0000000
--- a/gdb/config/sparc/tm-vxworks.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Target-dependent defenitions for VxWorks SPARC.
-
-   Copyright 1993, 1999, 2004 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-   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 TM_VXWORKS_H
-#define TM_VXWORKS_H
-
-/* Get generic VxWorks definitions.  */
-#include "config/tm-vxworks.h"
-
-#endif /* tm-vxworks.h */
diff --git a/gdb/config/sparc/vxworks.mt b/gdb/config/sparc/vxworks.mt
index 175f92e..ebb3e58 100644
--- a/gdb/config/sparc/vxworks.mt
+++ b/gdb/config/sparc/vxworks.mt
@@ -1,4 +1,4 @@
 # Target: VxWorks SPARC
 TDEPFILES= sparc-tdep.o \
 	remote-vx.o remote-vxsparc.o xdr_ld.o xdr_ptrace.o xdr_rdb.o
-TM_FILE= tm-vxworks.h
+TM_FILE= config/tm-vxworks.h
diff --git a/gdb/config/vax/nbsd.mt b/gdb/config/vax/nbsd.mt
index fb7f8ef..9cd754f 100644
--- a/gdb/config/vax/nbsd.mt
+++ b/gdb/config/vax/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: NetBSD/vax
 TDEPFILES= vax-tdep.o vaxnbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+TM_FILE= solib.h
diff --git a/gdb/config/vax/tm-nbsd.h b/gdb/config/vax/tm-nbsd.h
deleted file mode 100644
index f840c79..0000000
--- a/gdb/config/vax/tm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-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 TM_NBSD_H
-#define TM_NBSD_H
-
-#include "solib.h"
-
-#endif /* tm-nbsd.h */