diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8527bbfb02..f7c3e51d9ca 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-15  Michael Snyder  <msnyder@redhat.com>
 
+	* irix5-nat.c (supply_gregset): Allocate plenty-big buffer
+	(32 bytes) instead of using MAX_REGISTER_RAW_SIZE.
+	(supply_fpregset): Ditto.
+	
 	* config/mips/tm-mips.h (REGISTER_CONVERT_TO_VIRTUAL, 
 	REGISTER_CONVERT_TO_RAW, REGISTER_CONVERTIBLE, 
 	MAX_REGISTER_RAW_SIZE, MAX_REGISTER_VIRTUAL_SIZE): Delete.
diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index b98ec5ab521..d5b5c0c1c4d 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -56,8 +56,7 @@ supply_gregset (gregset_t *gregsetp)
   register int regi;
   register greg_t *regp = &(*gregsetp)[0];
   int gregoff = sizeof (greg_t) - MIPS_REGSIZE;
-  static char zerobuf[MAX_REGISTER_RAW_SIZE] =
-  {0};
+  static char zerobuf[32] = {0};
 
   for (regi = 0; regi <= CTX_RA; regi++)
     supply_register (regi, (char *) (regp + regi) + gregoff);
@@ -120,8 +119,7 @@ void
 supply_fpregset (fpregset_t *fpregsetp)
 {
   register int regi;
-  static char zerobuf[MAX_REGISTER_RAW_SIZE] =
-  {0};
+  static char zerobuf[32] = {0};
 
   /* FIXME, this is wrong for the N32 ABI which has 64 bit FP regs. */