diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7bb01755113..8146c452331 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-22  Ben Elliston  <bje@au.ibm.com>
+
+	* cse.c (fold_rtx): Typo fix.
+	(find_comparison_args): Pass the mode of arg1, not arg1 itself.
+
 2005-11-21  Richard Henderson  <rth@redhat.com>
 
 	* c-common.c, config/darwin-c.c, c-decl.c, c-tree.h, c-objc-common.h,
diff --git a/gcc/cse.c b/gcc/cse.c
index 8ec610f4825..284f3fd5bea 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -3088,7 +3088,7 @@ find_comparison_args (enum rtx_code code, rtx *parg1, rtx *parg2,
 	      || (GET_MODE_CLASS (GET_MODE (arg1)) == MODE_INT
 		  && code == LT && STORE_FLAG_VALUE == -1)
 #ifdef FLOAT_STORE_FLAG_VALUE
-	      || (SCALAR_FLOAT_MODE_P (arg1)
+	      || (SCALAR_FLOAT_MODE_P (GET_MODE (arg1))
 		  && (fsfv = FLOAT_STORE_FLAG_VALUE (GET_MODE (arg1)),
 		      REAL_VALUE_NEGATIVE (fsfv)))
 #endif
@@ -3098,7 +3098,7 @@ find_comparison_args (enum rtx_code code, rtx *parg1, rtx *parg2,
 		   || (GET_MODE_CLASS (GET_MODE (arg1)) == MODE_INT
 		       && code == GE && STORE_FLAG_VALUE == -1)
 #ifdef FLOAT_STORE_FLAG_VALUE
-		   || (SCALAR_FLOAT_MODE_P (arg1)
+		   || (SCALAR_FLOAT_MODE_P (GET_MODE (arg1))
 		       && (fsfv = FLOAT_STORE_FLAG_VALUE (GET_MODE (arg1)),
 			   REAL_VALUE_NEGATIVE (fsfv)))
 #endif
@@ -3946,7 +3946,7 @@ fold_rtx (rtx x, rtx insn)
 	  enum machine_mode mode_arg1;
 
 #ifdef FLOAT_STORE_FLAG_VALUE
-	  if (SCALAR_FLOAT_MODE (mode))
+	  if (SCALAR_FLOAT_MODE_P (mode))
 	    {
 	      true_rtx = (CONST_DOUBLE_FROM_REAL_VALUE
 			  (FLOAT_STORE_FLAG_VALUE (mode), mode));