* config/tm-linux.h: Delete file.

	* config/alpha/alpha-linux.mt (DEPRECATED_TM_FILE): Set to tm-alpha.h.
	* config/alpha/tm-alphalinux.h: Delete file.
	* config/arm/linux.mt (DEPRECATED_TM_FILE): Set to tm-arm.h
	* config/arm/tm-linux.h: Delete file.
	* config/i386/tm-linux.h: Do not include "config/tm-linux.h".
	* config/ia64/tm-linux.h: Do not include "config/tm-linux.h".
	* config/m32r/linux.mt (DEPRECATED_TM_FILE): Remove.
	* config/mips/tm-linux.h:  Do not include "config/tm-linux.h".
	* config/pa/linux.mt (DEPRECATED_TM_FILE): Set to tm-hppa.h.
	* config/pa/tm-linux.h: Delete file.
	* config/powerpc/tm-linux.h: Do not include "config/tm-linux.h".
	* config/s390/linux.mt (DEPRECATED_TM_FILE): Remove.
	* config/sh/linux.mt (DEPRECATED_TM_FILE): Set to tm-sh.h.
	* config/sh/tm-linux.h: Delete file.
	* alpha-linux-tdep.c: Include "symtab.h".
	(alpha_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* i386-linux-tdep.c: Include "symtab.h".
	(i386_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* ia64-linux-tdep.c: Include "symtab.h".
	(ia64_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* m32r-linux-tdep.c: Include "symtab.h".
	(m32r_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* mips-linux-tdep.c: Include "symtab.h".
	(mips_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* sh-linux-tdep.c: Include "symtab.h".
	(sh_linux_init_abi): Call set_gdbarch_skip_trampoline_code.
	* s390-tdep.c (s390_gdbarch_init): Call
	set_gdbarch_skip_trampoline_code.
	* s390-nat.c: Do not include "tm.h".
	* Makefile.in (alpha-linux-tdep.o): Add dependency on $(symtab_h).
	(i386-linux-tdep.o): Likewise.
	(ia64-linux-tdep.o): Likewise.
	(m32r-linux-tdep.o): Likewise.
	(mips-linux-tdep.o): Likewise.
	(sh-linux-tdep.o): Likewise.
	(s390-nat.o): Remove dependency on $(tm_h).

15 files changed, 6 insertions, 184 deletions

diff --git a/gdb/config/alpha/alpha-linux.mt b/gdb/config/alpha/alpha-linux.mt
index d07dbee..3fbee72 100644
--- a/gdb/config/alpha/alpha-linux.mt
+++ b/gdb/config/alpha/alpha-linux.mt
@@ -1,4 +1,4 @@
 # Target: Little-endian Alpha
 TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
 	   solib.o solib-svr4.o solib-legacy.o
-DEPRECATED_TM_FILE= tm-alphalinux.h
+DEPRECATED_TM_FILE= tm-alpha.h
diff --git a/gdb/config/alpha/tm-alphalinux.h b/gdb/config/alpha/tm-alphalinux.h
deleted file mode 100644
index ca1c0f8..0000000
--- a/gdb/config/alpha/tm-alphalinux.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Definitions to make GDB run on an Alpha box under GNU/Linux.  The
-   definitions here are used when the _target_ system is running
-   GNU/Linux.
-
-   Copyright 1996, 1998, 1999, 2000, 2002, 2003, 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_LINUXALPHA_H
-#define TM_LINUXALPHA_H
-
-#include "alpha/tm-alpha.h"
-
-#include "config/tm-linux.h"
-
-#endif /* TM_LINUXALPHA_H */
diff --git a/gdb/config/arm/linux.mt b/gdb/config/arm/linux.mt
index 49e65a0..f2beeff 100644
--- a/gdb/config/arm/linux.mt
+++ b/gdb/config/arm/linux.mt
@@ -1,5 +1,5 @@
 # Target: ARM based machine running GNU/Linux
-DEPRECATED_TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-arm.h
 TDEPFILES= arm-tdep.o arm-linux-tdep.o glibc-tdep.o solib.o \
   solib-svr4.o solib-legacy.o symfile-mem.o \
   corelow.o
diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
deleted file mode 100644
index 1aaab75..0000000
--- a/gdb/config/arm/tm-linux.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Target definitions for GNU/Linux on ARM, for GDB.
-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   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_ARMLINUX_H
-#define TM_ARMLINUX_H
-
-/* Include the common ARM target definitions.  */
-#include "arm/tm-arm.h"
-
-#include "config/tm-linux.h"
-
-/* We've multi-arched this.  */
-#undef SKIP_TRAMPOLINE_CODE
-
-/* When we call a function in a shared library, and the PLT sends us
-   into the dynamic linker to find the function's real address, we
-   need to skip over the dynamic linker call.  This function decides
-   when to skip, and where to skip to.  See the comments for
-   SKIP_SOLIB_RESOLVER at the top of infrun.c.  */
-#if 0   
-#undef IN_SOLIB_DYNSYM_RESOLVE_CODE
-extern CORE_ADDR arm_in_solib_dynsym_resolve_code (CORE_ADDR pc, char *name);
-#define IN_SOLIB_DYNSYM_RESOLVE_CODE  arm_in_solib_dynsym_resolve_code
-/* ScottB: Current definition is 
-extern CORE_ADDR in_svr4_dynsym_resolve_code (CORE_ADDR pc, char *name);
-#define IN_SOLIB_DYNSYM_RESOLVE_CODE  in_svr4_dynsym_resolve_code */
-#endif
-
-#endif /* TM_ARMLINUX_H */
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
index 1c8bbaf..7737021 100644
--- a/gdb/config/i386/tm-linux.h
+++ b/gdb/config/i386/tm-linux.h
@@ -23,8 +23,6 @@
 #ifndef TM_LINUX_H
 #define TM_LINUX_H
 
-#include "config/tm-linux.h"
-
 /* The following works around a problem with /usr/include/sys/procfs.h  */
 #define sys_quotactl 1
 
diff --git a/gdb/config/ia64/tm-linux.h b/gdb/config/ia64/tm-linux.h
index f1ecbb9..ea95511 100644
--- a/gdb/config/ia64/tm-linux.h
+++ b/gdb/config/ia64/tm-linux.h
@@ -22,8 +22,6 @@
 #ifndef TM_LINUX_H
 #define TM_LINUX_H
 
-#include "config/tm-linux.h"
-
 extern int ia64_linux_in_sigtramp (CORE_ADDR pc, char *func_name);
 #define DEPRECATED_IN_SIGTRAMP(pc,func_name) ia64_linux_in_sigtramp (pc, func_name)
 
diff --git a/gdb/config/m32r/linux.mt b/gdb/config/m32r/linux.mt
index 3ee326b..1a9cfaf 100644
--- a/gdb/config/m32r/linux.mt
+++ b/gdb/config/m32r/linux.mt
@@ -1,6 +1,5 @@
 # Target: Renesas M32R running GNU/Linux
 TDEPFILES= m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o glibc-tdep.o solib.o solib-svr4.o solib-legacy.o symfile-mem.o
-DEPRECATED_TM_FILE= config/tm-linux.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/m32r/libsim.a
diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h
index 2cff207..1519897 100644
--- a/gdb/config/mips/tm-linux.h
+++ b/gdb/config/mips/tm-linux.h
@@ -22,8 +22,6 @@
 #ifndef TM_MIPSLINUX_H
 #define TM_MIPSLINUX_H
 
-#include "config/tm-linux.h"
-
 #undef IN_SOLIB_DYNSYM_RESOLVE_CODE
 #define IN_SOLIB_DYNSYM_RESOLVE_CODE(PC) mips_linux_in_dynsym_resolve_code (PC)
 int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc);
diff --git a/gdb/config/pa/linux.mt b/gdb/config/pa/linux.mt
index ddfb72d..e286e1b 100644
--- a/gdb/config/pa/linux.mt
+++ b/gdb/config/pa/linux.mt
@@ -1,3 +1,3 @@
 # Target: HP PA-RISC running Linux
 TDEPFILES= hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o solib.o solib-svr4.o symfile-mem.o
-DEPRECATED_TM_FILE=tm-linux.h
+DEPRECATED_TM_FILE=tm-hppa.h
diff --git a/gdb/config/pa/tm-linux.h b/gdb/config/pa/tm-linux.h
deleted file mode 100644
index acbd46e..0000000
--- a/gdb/config/pa/tm-linux.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Definitions to target GDB to GNU/Linux on hppa-linux.
-   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_LINUX_H
-#define TM_LINUX_H
-
-#include "pa/tm-hppa.h"
-#include "config/tm-linux.h"
-
-#undef SKIP_TRAMPOLINE_CODE
-
-#endif /* #ifndef TM_LINUX_H */
diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index 312f059..6b213e2 100644
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -22,12 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TM_LINUX_H
 
 #include "powerpc/tm-ppc-eabi.h"
-/* Avoid warning from redefinition in tm-sysv4.h (included from tm-linux.h) */
-#undef SKIP_TRAMPOLINE_CODE
-#include "config/tm-linux.h"
 
-/* We've multi-arched these.  (Note that this completely undoes the
-   effect of config/tm-linux.h #including config/tm-sysv4.h.)  */
+/* We've multi-arched these.  */
 #undef SKIP_TRAMPOLINE_CODE
 
 /* Make sure nexti gets the help it needs for debugging assembly code
diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
index 84eca83..2299e7c 100644
--- a/gdb/config/s390/s390.mt
+++ b/gdb/config/s390/s390.mt
@@ -1,5 +1,2 @@
 # Target: S390 running Linux
-DEPRECATED_TM_FILE= config/tm-linux.h
-TDEPFILES=s390-tdep.o solib.o
-# Post 5.0 tdep-files
-TDEPFILES+=solib-svr4.o solib-legacy.o
+TDEPFILES=s390-tdep.o solib.o solib-svr4.o solib-legacy.o
diff --git a/gdb/config/sh/linux.mt b/gdb/config/sh/linux.mt
index 4f6e926..8de3d14 100644
--- a/gdb/config/sh/linux.mt
+++ b/gdb/config/sh/linux.mt
@@ -2,7 +2,7 @@
 TDEPFILES= sh-tdep.o sh64-tdep.o sh-linux-tdep.o \
 	monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o dsrec.o \
 	solib.o solib-svr4.o symfile-mem.o
-DEPRECATED_TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-sh.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/tm-linux.h b/gdb/config/sh/tm-linux.h
deleted file mode 100644
index 797041d..0000000
--- a/gdb/config/sh/tm-linux.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Target-specific definitions for GNU/Linux running on a Renesas
-   Super-H.
-
-   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.  */
-
-/* Pull in GNU/Linux generic defs.  */
-#include "config/tm-linux.h"
-
-/* Pull in sh-target defs */
-#include "sh/tm-sh.h"
-
diff --git a/gdb/config/tm-linux.h b/gdb/config/tm-linux.h
deleted file mode 100644
index deabd62..0000000
--- a/gdb/config/tm-linux.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native support for GNU/Linux, for GDB, the GNU debugger.
-   Copyright 1999, 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.  */
-
-/* We need this file for the SOLIB_TRAMPOLINE stuff. */
-
-/* If PC is in a shared library trampoline code, return the PC
-   where the function itself actually starts.  If not, return 0.  */
-
-#define SKIP_TRAMPOLINE_CODE(pc)  find_solib_trampoline_target (pc)
-