diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c99ac822775..80c7a802501 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-25  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.c (reg_or_const_float_1_operand): Reimplement
+	in terms of const_float_1_operand.
+
 2004-06-25  Richard Sandiford  <rsandifo@redhat.com>
 
 	PR target/16144
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index f481c4ba338..fe3e66d43e2 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -1428,26 +1428,13 @@ reg_or_0_operand (rtx op, enum machine_mode mode)
     }
 }
 
-/* Accept a register or the floating point constant 1 in the appropriate mode.  */
+/* Accept a register or the floating point constant 1 in the
+   appropriate mode.  */
 
 int
 reg_or_const_float_1_operand (rtx op, enum machine_mode mode)
 {
-  REAL_VALUE_TYPE d;
-
-  switch (GET_CODE (op))
-    {
-    case CONST_DOUBLE:
-      if (mode != GET_MODE (op)
-	  || (mode != DFmode && mode != SFmode))
-	return 0;
-
-      REAL_VALUE_FROM_CONST_DOUBLE (d, op);
-      return REAL_VALUES_EQUAL (d, dconst1);
-
-    default:
-      return register_operand (op, mode);
-    }
+  return const_float_1_operand (op, mode) || register_operand (op, mode);
 }
 
 /* Accept the floating point constant 1 in the appropriate mode.  */