diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c0853711607..2d6dd4211eda 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Richard Henderson  <rth@redhat.com>
+
+	* config/mn10300/mn10300.md (fmasf4, fmssf4, fnmasf4, fnmssf4): Rename
+	from fmaddsf4, fmsubsf4, fnmaddsf4, fnmsubsf4 respectively.  Use
+	fma rtx_code.
+
 2010-11-15  Richard Henderson  <rth@redhat.com>
 
 	* config/frv/frv.md (fmasf4, fmssf4): Rename from *muladdsf4
diff --git a/gcc/config/mn10300/mn10300.md b/gcc/config/mn10300/mn10300.md
index 9f2fc9f97283..1028357d61cb 100644
--- a/gcc/config/mn10300/mn10300.md
+++ b/gcc/config/mn10300/mn10300.md
@@ -2866,11 +2866,11 @@
   ]
 )
 
-(define_insn "fmaddsf4"
-  [(set (match_operand:SF                   0 "register_operand" "=A")
-	(plus:SF (mult:SF (match_operand:SF 1 "register_operand" "%f")
-			  (match_operand:SF 2 "register_operand" "f"))
-		 (match_operand:SF          3 "register_operand" "f")))
+(define_insn "fmasf4"
+  [(set (match_operand:SF         0 "register_operand" "=A")
+	(fma:SF (match_operand:SF 1 "register_operand" "f")
+		(match_operand:SF 2 "register_operand" "f")
+		(match_operand:SF 3 "register_operand" "f")))
    (clobber (reg:CC_FLOAT CC_REG))
   ]
   "TARGET_AM33_2"
@@ -2879,11 +2879,11 @@
 				       (const_int 17) (const_int 24)))]
 )
 
-(define_insn "fmsubsf4"
-  [(set (match_operand:SF                    0 "register_operand" "=A")
-	(minus:SF (mult:SF (match_operand:SF 1 "register_operand" "%f")
-			   (match_operand:SF 2 "register_operand" "f"))
-		  (match_operand:SF          3 "register_operand" "f")))
+(define_insn "fmssf4"
+  [(set (match_operand:SF                 0 "register_operand" "=A")
+	(fma:SF (match_operand:SF         1 "register_operand" "f")
+		(match_operand:SF         2 "register_operand" "f")
+		(neg:SF (match_operand:SF 3 "register_operand" "f"))))
    (clobber (reg:CC_FLOAT CC_REG))
   ]
   "TARGET_AM33_2"
@@ -2892,11 +2892,11 @@
 				       (const_int 17) (const_int 24)))]
 )
 
-(define_insn "fnmaddsf4"
-  [(set (match_operand:SF                    0 "register_operand" "=A")
-	(minus:SF (match_operand:SF          3 "register_operand" "f")
-		  (mult:SF (match_operand:SF 1 "register_operand" "%f")
-			   (match_operand:SF 2 "register_operand" "f"))))
+(define_insn "fnmasf4"
+  [(set (match_operand:SF                 0 "register_operand" "=A")
+	(fma:SF (neg:SF (match_operand:SF 1 "register_operand" "f"))
+		(match_operand:SF         2 "register_operand" "f")
+		(match_operand:SF         3 "register_operand" "f")))
    (clobber (reg:CC_FLOAT CC_REG))
   ]
   "TARGET_AM33_2"
@@ -2905,11 +2905,11 @@
 				       (const_int 17) (const_int 24)))]
 )
 
-(define_insn "fnmsubsf4"
-  [(set (match_operand:SF                            0 "register_operand" "=A")
-	(minus:SF (neg:SF (mult:SF (match_operand:SF 1 "register_operand" "%f")
-				   (match_operand:SF 2 "register_operand" "f")))
-		  (match_operand:SF                  3 "register_operand" "f")))
+(define_insn "fnmssf4"
+  [(set (match_operand:SF                 0 "register_operand" "=A")
+	(fma:SF (neg:SF (match_operand:SF 1 "register_operand" "f"))
+		(match_operand:SF         2 "register_operand" "f")
+		(neg:SF (match_operand:SF 3 "register_operand" "f"))))
    (clobber (reg:CC_FLOAT CC_REG))
   ]
   "TARGET_AM33_2"