4 files changed, 10 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 840cfcc..a9096a3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu May  4 20:54:00 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* config/mips/tm-mipsv4.h (Dest_Reg), config/mips/tm-irix5.h
+ 	(MIPS_NUM_ARG_REGS, Dest_Reg), config/mips/tm-mips.h
+ 	(MIPS_NUM_ARG_REGS): Delete unused macros.
+
 2000-05-01  Mark Kettenis  <kettenis@gnu.org>
 
 	* infrun.c (handle_inferior_event): When doing a "next", and
diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index 7f828c3..aac3136 100644
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -46,16 +46,8 @@
 #undef  MIPS_LAST_ARG_REGNUM
 #define MIPS_LAST_ARG_REGNUM 11	/* N32 uses R4 through R11 for args */
 
-#undef  MIPS_NUM_ARG_REGS
-#define MIPS_NUM_ARG_REGS 8
-
 #endif /* N32 */
 
-/* When calling functions on Irix 5 (or any MIPS SVR4 ABI compliant
-   platform) $25 must hold the function address.  Dest_Reg is a macro
-   used in CALL_DUMMY in tm-mips.h.  */
-#undef Dest_Reg
-#define Dest_Reg 25
 
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 2f52fbe..e04638c 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -185,10 +185,8 @@ extern char *mips_register_name PARAMS ((int regnr));
 #define A0_REGNUM 4		/* Loc of first arg during a subr call */
 #if MIPS_EABI
 #define MIPS_LAST_ARG_REGNUM 11	/* EABI uses R4 through R11 for args */
-#define MIPS_NUM_ARG_REGS 8
 #else
 #define MIPS_LAST_ARG_REGNUM 7	/* old ABI uses R4 through R7 for args */
-#define MIPS_NUM_ARG_REGS 4
 #endif
 #define T9_REGNUM 25		/* Contains address of callee in PIC */
 #define SP_REGNUM 29		/* Contains address of top of stack */
@@ -430,8 +428,10 @@ extern void mips_pop_frame PARAMS ((void));
 
 #define CALL_DUMMY_BREAKPOINT_OFFSET (0)
 
-/* On Irix, $t9 ($25) contains the address of the callee (used for PIC).
-   It doesn't hurt to do this on other systems; $t9 will be ignored.  */
+/* When calling functions on Irix 5 (or any MIPS SVR4 ABI compliant
+   platform), $t9 ($25) (Dest_Reg) contains the address of the callee
+   (used for PIC).  It doesn't hurt to do this on other systems; $t9
+   will be ignored.  */
 #define FIX_CALL_DUMMY(dummyname, start_sp, fun, nargs, args, rettype, gcc_p) \
     write_register(T9_REGNUM, fun)
 
diff --git a/gdb/config/mips/tm-mipsv4.h b/gdb/config/mips/tm-mipsv4.h
index 03fa499..82b7918 100644
--- a/gdb/config/mips/tm-mipsv4.h
+++ b/gdb/config/mips/tm-mipsv4.h
@@ -21,12 +21,6 @@
 #include "mips/tm-bigmips.h"
 #include "tm-sysv4.h"
 
-/* When calling functions on a MIPS SVR4 ABI compliant platform
-   $25 must hold the function address.  Dest_Reg is a macro
-   used in CALL_DUMMY in tm-mips.h.  */
-#undef Dest_Reg
-#define Dest_Reg 25
-
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
 #define IN_SIGTRAMP(pc, name) ((name) && STREQ ("_sigtramp", name))