diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6816ef23d94..256771977e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-15  Uros Bizjak  <ubizjak@gmail.com>
+	    Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	* config/i386/i386.md (x86_sahf_1): Correctly handle
+	HAVE_AS_IX86_SAHF.
+
 2007-03-15  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/31167
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 98c74f5131c..bdf8bef16dd 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -988,7 +988,13 @@
 	(unspec:CC [(match_operand:HI 0 "register_operand" "a")]
 		   UNSPEC_SAHF))]
   "TARGET_SAHF"
-  "* return HAVE_AS_IX86_SAHF ? \"sahf\" : \".byte\t0x9e\";"
+{
+#ifdef HAVE_AS_IX86_SAHF
+  return "sahf";
+#else
+  return ".byte\t0x9e";
+#endif
+}
   [(set_attr "length" "1")
    (set_attr "athlon_decode" "vector")
    (set_attr "amdfam10_decode" "direct")