2004-11-13 Andrew Cagney <cagney@gnu.org>

	* config/tm-sysv4.h: Delete file, inlining contents.
	* config/ia64/tm-aix.h (SKIP_TRAMPOLINE_CODE): Define.
	* config/tm-linux.h (SKIP_TRAMPOLINE_CODE): Define.
	* config/tm-nto.h (SKIP_TRAMPOLINE_CODE): Define.

5 files changed, 18 insertions, 31 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cafff68..e24479d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-13  Andrew Cagney  <cagney@gnu.org>
 
+	* config/tm-sysv4.h: Delete file, inlining contents.
+	* config/ia64/tm-aix.h (SKIP_TRAMPOLINE_CODE): Define.
+	* config/tm-linux.h (SKIP_TRAMPOLINE_CODE): Define.
+	* config/tm-nto.h (SKIP_TRAMPOLINE_CODE): Define.
+
 	* regcache.h (deprecated_register_valid): Delete.
 	(deprecated_registers): Delete.
 	* regcache.c (deprecated_register_valid): Delete.
@@ -11,8 +16,6 @@
 	* config/powerpc/ppc-eabi.mt (TDEPFILES): Ditto.
 	* config/mips/embed.mt (TDEPFILES): Remove remote-mips.o.
 
-2004-11-13  Andrew Cagney  <cagney@gnu.org>
-
 	* NEWS: List h8300*-*-*, mcore-*-*, mn10300-*-*, ns32k-*-*, and
 	v850-*-* under removed.
 	* configure.host: Delete ns32k-*-netbsd*.
diff --git a/gdb/config/ia64/tm-aix.h b/gdb/config/ia64/tm-aix.h
index aabe088..5390b26 100644
--- a/gdb/config/ia64/tm-aix.h
+++ b/gdb/config/ia64/tm-aix.h
@@ -23,7 +23,11 @@
 #define TM_AIX_H
 
 #include "ia64/tm-ia64.h"
-#include "config/tm-sysv4.h"
+
+/* 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)
 
 extern int ia64_aix_in_sigtramp (CORE_ADDR pc, char *func_name);
 #define DEPRECATED_IN_SIGTRAMP(pc,func_name) ia64_aix_in_sigtramp (pc, func_name)
diff --git a/gdb/config/tm-linux.h b/gdb/config/tm-linux.h
index 2ee2acd..942995f 100644
--- a/gdb/config/tm-linux.h
+++ b/gdb/config/tm-linux.h
@@ -30,6 +30,9 @@
 
 /* We need this file for the SOLIB_TRAMPOLINE stuff. */
 
-#include "config/tm-sysv4.h"
+/* 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)
 
 #include "solib.h"		/* Support for shared libraries. */
diff --git a/gdb/config/tm-nto.h b/gdb/config/tm-nto.h
index 98494a9..5ca3c06 100644
--- a/gdb/config/tm-nto.h
+++ b/gdb/config/tm-nto.h
@@ -26,7 +26,10 @@
 #ifndef _TM_QNXNTO_H
 #define _TM_QNXNTO_H
 
-#include "tm-sysv4.h"
+/* 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)
 
 /* Setup the valid realtime signal range.  */
 #define REALTIME_LO 41
diff --git a/gdb/config/tm-sysv4.h b/gdb/config/tm-sysv4.h
deleted file mode 100644
index 9e42320..0000000
--- a/gdb/config/tm-sysv4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Macro definitions for GDB on all SVR4 target systems.
-   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2000
-   Free Software Foundation, Inc.
-   Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
-
-   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.  */
-
-/* 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)