diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8138da594df..6c2fb2fae60 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-31  Richard Henderson  <rth@redhat.com>
+
+	* config/i386/i386.c (absnegsf2_mixed): Remove all of the # hackery.
+	(absnegsf2_sse, absnegsf2_i387, absnegdf2_mixed, absnegdf2_sse,
+	absnegdf2_i387, absnegxf2_i387): Likewise.
+
 2005-01-31  Richard Henderson  <rth@redhat.com>
 
 	PR 19696
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 4f8d31093f0..3fdf441291d 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -9422,27 +9422,27 @@
   "ix86_expand_fp_absneg_operator (ABS, SFmode, operands); DONE;")
 
 (define_insn "*absnegsf2_mixed"
-  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x#fr,x#fr,f#xr,rm#xf")
+  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x#f,x#f,f#x,rm")
 	(match_operator:SF 3 "absneg_operator"
-	  [(match_operand:SF 1 "nonimmediate_operand" "0    ,x#fr,0   ,0")]))
-   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm   ,0   ,X   ,X"))
+	  [(match_operand:SF 1 "nonimmediate_operand" "0   ,x#f,0  ,0")]))
+   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm  ,0  ,X  ,X"))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_SSE_MATH && TARGET_MIX_SSE_I387
    && ix86_unary_operator_ok (GET_CODE (operands[3]), SFmode, operands)"
   "#")
 
 (define_insn "*absnegsf2_sse"
-  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x#r,x#r,rm#x")
+  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x,x,rm")
 	(match_operator:SF 3 "absneg_operator"
-	  [(match_operand:SF 1 "nonimmediate_operand" "0   ,x#r,0")]))
-   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm  ,0  ,X"))
+	  [(match_operand:SF 1 "nonimmediate_operand" "0 ,x,0")]))
+   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm,0,X"))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_SSE_MATH
    && ix86_unary_operator_ok (GET_CODE (operands[3]), SFmode, operands)"
   "#")
 
 (define_insn "*absnegsf2_i387"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=f#r,rm#f")
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=f,rm")
 	(match_operator:SF 3 "absneg_operator"
 	  [(match_operand:SF 1 "nonimmediate_operand" "0,0")]))
    (use (match_operand 2 "" ""))
@@ -9518,27 +9518,27 @@
   "ix86_expand_fp_absneg_operator (ABS, DFmode, operands); DONE;")
 
 (define_insn "*absnegdf2_mixed"
-  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y#fr,Y#fr,f#Yr,rm#Yf")
+  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y#f,Y#f,f#Y,rm")
 	(match_operator:DF 3 "absneg_operator"
-	  [(match_operand:DF 1 "nonimmediate_operand" "0    ,Y#fr,0   ,0")]))
-   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym   ,0   ,X   ,X"))
+	  [(match_operand:DF 1 "nonimmediate_operand" "0   ,Y#f,0  ,0")]))
+   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym  ,0  ,X  ,X"))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
    && ix86_unary_operator_ok (GET_CODE (operands[3]), DFmode, operands)"
   "#")
 
 (define_insn "*absnegdf2_sse"
-  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y#r,Y#r,rm#Y")
+  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y,Y,rm")
 	(match_operator:DF 3 "absneg_operator"
-	  [(match_operand:DF 1 "nonimmediate_operand" "0   ,Y#r,0")]))
-   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym  ,0  ,X"))
+	  [(match_operand:DF 1 "nonimmediate_operand" "0 ,Y,0")]))
+   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym,0,X"))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_SSE2 && TARGET_SSE_MATH
    && ix86_unary_operator_ok (GET_CODE (operands[3]), DFmode, operands)"
   "#")
 
 (define_insn "*absnegdf2_i387"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#r,rm#f")
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,rm")
 	(match_operator:DF 3 "absneg_operator"
 	  [(match_operand:DF 1 "nonimmediate_operand" "0,0")]))
    (use (match_operand 2 "" ""))
@@ -9614,7 +9614,7 @@
   "ix86_expand_fp_absneg_operator (ABS, XFmode, operands); DONE;")
 
 (define_insn "*absnegxf2_i387"
-  [(set (match_operand:XF 0 "nonimmediate_operand" "=f#r,rm#f")
+  [(set (match_operand:XF 0 "nonimmediate_operand" "=f,?rm")
 	(match_operator:XF 3 "absneg_operator"
 	  [(match_operand:XF 1 "nonimmediate_operand" "0,0")]))
    (use (match_operand 2 "" ""))