diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d9152d9b7ef..b259f42fd11 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-08  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR target/10567
+	* config/sparc/sparc.md (update_return): Honor flag_delayed_branch.
+
 2004-07-08  Diego Novillo  <dnovillo@redhat.com>
 
 	* tree-ssa-operands.c (get_asm_expr_operands): Fix thinkos in
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index c4f4daf2e64..021e9102ebc 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -7758,9 +7758,17 @@
   [(unspec:SI [(match_operand:SI 0 "register_operand" "r")
 	       (match_operand:SI 1 "register_operand" "r")] UNSPEC_UPDATE_RETURN)]
   "! TARGET_ARCH64"
-  "cmp\t%1, 0\;be,a\t.+8\;add\t%0, 4, %0"
-  [(set_attr "type" "multi")
-   (set_attr "length" "3")])
+{
+  if (flag_delayed_branch)
+    return "cmp\t%1, 0\n\tbe,a\t.+8\n\t add\t%0, 4, %0";
+  else
+    return "cmp\t%1, 0\n\tbne\t.+12\n\t nop\n\tadd\t%0, 4, %0";
+}
+  [(set (attr "type") (const_string "multi"))
+   (set (attr "length")
+	(if_then_else (eq_attr "delayed_branch" "true")
+		      (const_int 3)
+		      (const_int 4)))])
 
 (define_insn "nop"
   [(const_int 0)]