2004-10-31 Andrew Cagney <cagney@gnu.org>

	* config/mips/tm-mips.h: Delete file.
	* remote-mips.c: Delete tm-mips.h from comment.
	* config/mips/embed.mt (DEPRECATED_TM_FILE): Delete.
	* config/mips/tm-nbsd.h: Don't include tm-mips.h.
	* config/mips/irix6.mt (DEPRECATED_TM_FILE): Delete.
	* config/mips/tm-linux.h: Don't include tm-mips.h.
	* config/mips/tm-vxmips.h: Don't include tm-mips.h.
	* config/mips/irix5.mt (DEPRECATED_TM_FILE):
	* config/mips/tm-wince.h: Don't include.

10 files changed, 11 insertions, 52 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c88947d..d2ee3ae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 2004-10-31  Andrew Cagney  <cagney@gnu.org>
 
+	* config/mips/tm-mips.h: Delete file.
+	* remote-mips.c: Delete tm-mips.h from comment.
+	* config/mips/embed.mt (DEPRECATED_TM_FILE): Delete.
+	* config/mips/tm-nbsd.h: Don't include tm-mips.h.
+	* config/mips/irix6.mt (DEPRECATED_TM_FILE): Delete.
+	* config/mips/tm-linux.h: Don't include tm-mips.h.
+	* config/mips/tm-vxmips.h: Don't include tm-mips.h.
+	* config/mips/irix5.mt (DEPRECATED_TM_FILE): 
+	* config/mips/tm-wince.h: Don't include.
+
 	* mdebugread.h (MDEBUG_EFI_SYMBOL_NAME): Define.
 	* mdebugread.c (MDEBUG_EFI_SYMBOL_NAME): Delete.
 	* config/alpha/tm-alpha.h (MDEBUG_EFI_SYMBOL_NAME): Delete.
diff --git a/gdb/config/mips/embed.mt b/gdb/config/mips/embed.mt
index 9918aa2..ee04cef 100644
--- a/gdb/config/mips/embed.mt
+++ b/gdb/config/mips/embed.mt
@@ -1,4 +1,3 @@
 TDEPFILES= mips-tdep.o remote-mips.o mips-mdebug-tdep.o
-DEPRECATED_TM_FILE= tm-mips.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/irix5.mt b/gdb/config/mips/irix5.mt
index 5699589..8dd37ea 100644
--- a/gdb/config/mips/irix5.mt
+++ b/gdb/config/mips/irix5.mt
@@ -1,3 +1,2 @@
 # Target: MIPS SGI running Irix 5
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-DEPRECATED_TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/irix6.mt b/gdb/config/mips/irix6.mt
index dde6a07..1448ec0 100644
--- a/gdb/config/mips/irix6.mt
+++ b/gdb/config/mips/irix6.mt
@@ -1,3 +1,2 @@
 # Target: MIPS SGI running Irix 6.x
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-DEPRECATED_TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h
index 8ef4ce5..8dc6c76 100644
--- a/gdb/config/mips/tm-linux.h
+++ b/gdb/config/mips/tm-linux.h
@@ -22,12 +22,6 @@
 #ifndef TM_MIPSLINUX_H
 #define TM_MIPSLINUX_H
 
-#include "mips/tm-mips.h"
-
-/* We don't want to inherit tm-mips.h's shared library trampoline code.  */
-
-#undef IGNORE_HELPER_CALL
-
 /* GNU/Linux MIPS has __SIGRTMAX == 127.  */
 
 #ifndef REALTIME_LO
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
deleted file mode 100644
index 5919a12..0000000
--- a/gdb/config/mips/tm-mips.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Definitions to make GDB run on a mips box under 4.3bsd.
-
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
-   1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
-
-   Contributed by Per Bothner (bothner@cs.wisc.edu) at U.Wisconsin
-   and by Alessandro Forin (af@cs.cmu.edu) at CMU..
-
-   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_MIPS_H
-#define TM_MIPS_H 1
-
-#include "regcache.h"
-
-struct frame_info;
-struct symbol;
-struct type;
-struct value;
-
-#endif /* TM_MIPS_H */
diff --git a/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h
index 90909dd..f79c01f 100644
--- a/gdb/config/mips/tm-nbsd.h
+++ b/gdb/config/mips/tm-nbsd.h
@@ -22,10 +22,8 @@
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
 
-#include "mips/tm-mips.h"
 #include "solib.h"
 
-/* We don't want to inherit tm-mips.h's shared library trampoline code.  */
 #undef IN_SOLIB_CALL_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 #undef DEPRECATED_IGNORE_HELPER_CALL
diff --git a/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h
index 5eb1043..16e1b2a 100644
--- a/gdb/config/mips/tm-vxmips.h
+++ b/gdb/config/mips/tm-vxmips.h
@@ -19,5 +19,4 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "mips/tm-mips.h"
 #include "config/tm-vxworks.h"
diff --git a/gdb/config/mips/tm-wince.h b/gdb/config/mips/tm-wince.h
index 3ea179b..0e817a3 100644
--- a/gdb/config/mips/tm-wince.h
+++ b/gdb/config/mips/tm-wince.h
@@ -22,8 +22,6 @@
 #ifndef TM_WINCE_H
 #define TM_WINCE_H 1
 
-#include "mips/tm-mips.h"
-
 #undef SOFTWARE_SINGLE_STEP_P
 #define SOFTWARE_SINGLE_STEP_P() 1
 #define SOFTWARE_SINGLE_STEP(sig, bp_p) wince_software_single_step (sig, bp_p)
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 2b40066..971da6d 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1860,8 +1860,7 @@ mips_wait (ptid_t ptid, struct target_waitstatus *status)
 }
 
 /* We have to map between the register numbers used by gdb and the
-   register numbers used by the debugging protocol.  This function
-   assumes that we are using tm-mips.h.  */
+   register numbers used by the debugging protocol.  */
 
 #define REGNO_OFFSET 96