2004-08-01 Andrew Cagney <cagney@gnu.org>

	* config/mips/tm-irix6.h: Delete file.
	* config/mips/tm-irix5.h: Delete file.
	* config/mips/irix5.mt (TM_FILE): Set to tm-mips.h
	* config/mips/irix6.mt (TM_FILE): Set to tm-mips.h

5 files changed, 7 insertions, 86 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6c8d176..64d9a6d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-08-01  Andrew Cagney  <cagney@gnu.org>
 
+	* config/mips/tm-irix6.h: Delete file.
+	* config/mips/tm-irix5.h: Delete file.
+	* config/mips/irix5.mt (TM_FILE): Set to tm-mips.h
+	* config/mips/irix6.mt (TM_FILE): Set to tm-mips.h
+
 	* config/ia64/tm-linux.h (IA64_GNULINUX_TARGET): Delete.
 	* config/alpha/nm-osf2.h (PROCFS_SIGPEND_OFFSET): Delete.
 	* config/nm-gnu.h (NO_CORE_OPS): Delete.
diff --git a/gdb/config/mips/irix5.mt b/gdb/config/mips/irix5.mt
index 81e0f15..4a9e748 100644
--- a/gdb/config/mips/irix5.mt
+++ b/gdb/config/mips/irix5.mt
@@ -1,3 +1,3 @@
 # Target: MIPS SGI running Irix 5
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-TM_FILE= tm-irix5.h
+TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/irix6.mt b/gdb/config/mips/irix6.mt
index 3a5a774..9143be2 100644
--- a/gdb/config/mips/irix6.mt
+++ b/gdb/config/mips/irix6.mt
@@ -1,3 +1,3 @@
 # Target: MIPS SGI running Irix 6.x
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-TM_FILE= tm-irix6.h
+TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
deleted file mode 100644
index 5e90580..0000000
--- a/gdb/config/mips/tm-irix5.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Target machine description for SGI Iris under Irix 5, for GDB.
-
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2000, 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 "mips/tm-mips.h"
-
-/* Offsets for register values in _sigtramp frame.
-   sigcontext is immediately above the _sigtramp frame on Irix.  */
-#define SIGFRAME_BASE		0x0
-#define SIGFRAME_PC_OFF		(SIGFRAME_BASE + 2 * 4)
-#define SIGFRAME_REGSAVE_OFF	(SIGFRAME_BASE + 3 * 4)
-#define SIGFRAME_FPREGSAVE_OFF	(SIGFRAME_BASE + 3 * 4 + 32 * 4 + 4)
-
-/* Irix 5 saves a full 64 bits for each register.  We skip 2 * 4 to
-   get to the saved PC (the register mask and status register are both
-   32 bits) and then another 4 to get to the lower 32 bits.  We skip
-   the same 4 bytes, plus the 8 bytes for the PC to get to the
-   registers, and add another 4 to get to the lower 32 bits.  We skip
-   8 bytes per register.  */
-#undef SIGFRAME_PC_OFF
-#define SIGFRAME_PC_OFF		(SIGFRAME_BASE + 2 * 4 + 4)
-#undef SIGFRAME_REGSAVE_OFF
-#define SIGFRAME_REGSAVE_OFF	(SIGFRAME_BASE + 2 * 4 + 8 + 4)
-#undef SIGFRAME_FPREGSAVE_OFF
-#define SIGFRAME_FPREGSAVE_OFF	(SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
diff --git a/gdb/config/mips/tm-irix6.h b/gdb/config/mips/tm-irix6.h
deleted file mode 100644
index 8b61f0e..0000000
--- a/gdb/config/mips/tm-irix6.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Target machine description for SGI Iris under Irix 6.x, for GDB.
-
-   Copyright 2001, 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 "mips/tm-mips.h"
-#include "solib.h"
-
-/* Offsets for register values in _sigtramp frame.
-   sigcontext is immediately above the _sigtramp frame on Irix.  */
-#undef SIGFRAME_BASE
-#define SIGFRAME_BASE		0
-
-/* Irix 5 saves a full 64 bits for each register.  We skip 2 * 4 to
-   get to the saved PC (the register mask and status register are both
-   32 bits) and then another 4 to get to the lower 32 bits.  We skip
-   the same 4 bytes, plus the 8 bytes for the PC to get to the
-   registers, and add another 4 to get to the lower 32 bits.  We skip
-   8 bytes per register.  */
-#undef SIGFRAME_PC_OFF
-#define SIGFRAME_PC_OFF		(SIGFRAME_BASE + 2 * 4 + 4)
-#undef SIGFRAME_REGSAVE_OFF
-#define SIGFRAME_REGSAVE_OFF	(SIGFRAME_BASE + 2 * 4 + 8 + 4)
-#undef SIGFRAME_FPREGSAVE_OFF
-#define SIGFRAME_FPREGSAVE_OFF	(SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)