diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8705bf281739..586c463df20f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-07  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.c (override_options): Allow the hi and lo registers
+	to store any integral mode, not just MODE_INTs.
+
 2004-05-07  Paul Brook  <paul@codesourcery.com>
 
 	* config/arm/arm.c (arm_promote_prototypes): Use TARGET_AAPCS_BASED.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 598120fd409f..beb7250f6a6c 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4970,7 +4970,7 @@ override_options (void)
 			|| (ISA_HAS_8CC && mode == TFmode));
 
 	  else if (MD_REG_P (regno))
-	    temp = (class == MODE_INT
+	    temp = (INTEGRAL_MODE_P (mode)
 		    && (size <= UNITS_PER_WORD
 			|| (regno == MD_REG_FIRST
 			    && size == 2 * UNITS_PER_WORD)));