2003-11-16 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gdb / config / mips / tm-irix6.h

diff --git a/gdb/config/mips/tm-irix6.h b/gdb/config/mips/tm-irix6.h
index e6395ae6ef942bf9da18749eb80c2ee56042052c..037ac81b41984c9afed1f04a8460ea0f1a81fc6d 100644 (file)
--- a/gdb/config/mips/tm-irix6.h
+++ b/gdb/config/mips/tm-irix6.h
@@ -1,6 +1,6 @@
 /* Target machine description for SGI Iris under Irix 6.x, for GDB.
 
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "mips/tm-mips64.h"
+#include "mips/tm-mips.h"
 #include "solib.h"
 
 /* Redefine register numbers for SGI. */
@@ -64,11 +64,11 @@
 
 #undef  MIPS_REGISTER_BYTE
 #define MIPS_REGISTER_BYTE(N) \
-     (((N) < FP0_REGNUM) ? (N) * MIPS_REGSIZE : \
+     (((N) < FP0_REGNUM) ? (N) * mips_regsize (current_gdbarch) : \
       ((N) < FP0_REGNUM + 32) ?     \
-      FP0_REGNUM * MIPS_REGSIZE + \
+      FP0_REGNUM * mips_regsize (current_gdbarch) + \
       ((N) - FP0_REGNUM) * sizeof(double) : \
-      32 * sizeof(double) + ((N) - 32) * MIPS_REGSIZE)
+      32 * sizeof(double) + ((N) - 32) * mips_regsize (current_gdbarch))
 
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
@@ -92,6 +92,3 @@
 #undef SIGFRAME_FPREGSAVE_OFF
 #define SIGFRAME_FPREGSAVE_OFF (SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
 #define SIGFRAME_REG_SIZE      8
-
-/* Undefine those methods which have been multiarched.  */
-#undef MIPS_REGISTER_TYPE