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

	* config/rs6000/tm-rs6000-aix4.h: Delete file.
	* config/djgpp/fnchange.lst: Do not rename tm-rs6000-aix4.h.
	* config/rs6000/aix4.mt (TM_FILE): Set to
	config/rs6000/tm-rs6000.h.
	* config/powerpc/tm-ppc-aix.h: Delete file.
	* config/powerpc/aix.mt (TM_FILE): Set to
	config/rs6000/tm-rs6000.h.
	* config/m68k/tm-linux.h: Delete file.
	* config/m68k/linux.mt (TM_FILE): Set to solib.h
	* config/i386/tm-linux64.h: Delete file.
	* config/i386/linux64.mt (TM_FILE): Set to solib.h.
	* config/djgpp/fnchange.lst: Do not rename tm-linux.h.

10 files changed, 17 insertions, 112 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b5f11584e69..e185b56abb8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,18 @@
 2004-09-03  Andrew Cagney  <cagney@gnu.org>
 
+	* config/rs6000/tm-rs6000-aix4.h: Delete file.
+	* config/djgpp/fnchange.lst: Do not rename tm-rs6000-aix4.h.
+	* config/rs6000/aix4.mt (TM_FILE): Set to
+	config/rs6000/tm-rs6000.h.
+	* config/powerpc/tm-ppc-aix.h: Delete file.
+	* config/powerpc/aix.mt (TM_FILE): Set to
+	config/rs6000/tm-rs6000.h.
+	* config/m68k/tm-linux.h: Delete file.
+	* config/m68k/linux.mt (TM_FILE): Set to solib.h
+	* config/i386/tm-linux64.h: Delete file.
+	* config/i386/linux64.mt (TM_FILE): Set to solib.h.
+	* config/djgpp/fnchange.lst: Do not rename tm-linux.h.
+	
 	* config/m68k/tm-linux.h (SVR4_SHARED_LIBS): Delete.
 	* config/i386/tm-linux64.h (SVR4_SHARED_LIBS): Delete.
 	* config/i386/nm-i386sco5.h (SVR4_SHARED_LIBS): Delete.
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index 2195c5605cf..0c79741f6fc 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -89,7 +89,6 @@
 @V@/gdb/config/alpha/alpha-osf3.mh @V@/gdb/config/alpha/alphosf3.mh
 @V@/gdb/config/alpha/tm-alphalinux.h @V@/gdb/config/alpha/tm-alplinux.h
 @V@/gdb/config/i386/nm-linux64.h @V@/gdb/config/i386/nm-lx64.h
-@V@/gdb/config/i386/tm-linux64.h @V@/gdb/config/i386/tm-lx64.h
 @V@/gdb/config/i386/nm-i386sco4.h @V@/gdb/config/i386/nm-sco4.h
 @V@/gdb/config/i386/nm-i386sco5.h @V@/gdb/config/i386/nm-sco5.h
 @V@/gdb/config/i386/nm-i386sol2.h @V@/gdb/config/i386/nm-sol2.h
@@ -103,7 +102,6 @@
 @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/rs6000/tm-rs6000-aix4.h @V@/gdb/config/rs6000/tm-rs6kaix4.h
 @V@/gdb/config/sparc/tm-sparclynx.h @V@/gdb/config/sparc/tm-splynx.h
 @V@/gdb/f-exp.tab.c @V@/gdb/f-exp_tab.c
 @V@/gdb/gdbtk/ChangeLog-2001 @V@/gdb/gdbtk/ChangeLog.001
diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt
index d0822536432..64baa35cae1 100644
--- a/gdb/config/i386/linux64.mt
+++ b/gdb/config/i386/linux64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= amd64-tdep.o amd64-linux-tdep.o \
 	i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
 	solib.o solib-svr4.o corelow.o
-TM_FILE=tm-linux64.h
+TM_FILE= solib.h
diff --git a/gdb/config/i386/tm-linux64.h b/gdb/config/i386/tm-linux64.h
deleted file mode 100644
index 1aad06575c9..00000000000
--- a/gdb/config/i386/tm-linux64.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Target-dependent definitions for GNU/Linux x86-64.
-
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   Contributed by Michal Ludvig, SuSE Labs.
-
-   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_LINUX64_H
-#define TM_LINUX64_H
-
-#include "solib.h"              /* Support for shared libraries. */
-
-#endif /* tm-linux64.h */
diff --git a/gdb/config/m68k/linux.mt b/gdb/config/m68k/linux.mt
index 42171335aaa..75e5db2aff1 100644
--- a/gdb/config/m68k/linux.mt
+++ b/gdb/config/m68k/linux.mt
@@ -1,3 +1,3 @@
 # Target: Motorola m68k with a.out and ELF
 TDEPFILES= m68k-tdep.o m68klinux-tdep.o solib.o solib-svr4.o solib-legacy.o
-TM_FILE= tm-linux.h
+TM_FILE= solib.h
diff --git a/gdb/config/m68k/tm-linux.h b/gdb/config/m68k/tm-linux.h
deleted file mode 100644
index 7892e60cc12..00000000000
--- a/gdb/config/m68k/tm-linux.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Definitions to target GDB to GNU/Linux on m680x0.
-
-   Copyright 1996, 1998, 1999, 2000, 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.  */
-
-#include "solib.h"		/* Support for shared libraries. */
diff --git a/gdb/config/powerpc/aix.mt b/gdb/config/powerpc/aix.mt
index d7ba624da91..240d5ce854f 100644
--- a/gdb/config/powerpc/aix.mt
+++ b/gdb/config/powerpc/aix.mt
@@ -1,3 +1,3 @@
 # Target: PowerPC running AIX
 TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-ppc-aix.h
+TM_FILE= config/rs6000/tm-rs6000.h
diff --git a/gdb/config/powerpc/tm-ppc-aix.h b/gdb/config/powerpc/tm-ppc-aix.h
deleted file mode 100644
index 03809c9e696..00000000000
--- a/gdb/config/powerpc/tm-ppc-aix.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Macro definitions for Power PC running AIX.
-   Copyright 1995, 2000 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_PPC_AIX_H
-#define TM_PPC_AIX_H
-
-/* Use generic RS6000 definitions. */
-#include "rs6000/tm-rs6000.h"
-
-#endif /* TM_PPC_AIX_H */
diff --git a/gdb/config/rs6000/aix4.mt b/gdb/config/rs6000/aix4.mt
index 388c4f237d8..4c5603803d0 100644
--- a/gdb/config/rs6000/aix4.mt
+++ b/gdb/config/rs6000/aix4.mt
@@ -1,3 +1,3 @@
 # Target: IBM RS/6000 running AIX4
 TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-rs6000-aix4.h
+TM_FILE= config/rs6000/tm-rs6000.h
diff --git a/gdb/config/rs6000/tm-rs6000-aix4.h b/gdb/config/rs6000/tm-rs6000-aix4.h
deleted file mode 100644
index 243befe7d6f..00000000000
--- a/gdb/config/rs6000/tm-rs6000-aix4.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Macro definitions for RS/6000 running AIX4.
-   Copyright 1995, 1997 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_RS6000_AIX4_H
-#define TM_RS6000_AIX4_H
-
-/* Use generic RS6000 definitions. */
-#include "rs6000/tm-rs6000.h"
-
-#endif /* TM_RS6000_AIX4_H */