sparc.c (output_return): Fix thinko in the output of an EH return when delayed branch...

	* config/sparc/sparc.c (output_return): Fix thinko in the output of an
	EH return when delayed branches are disabled.

From-SVN: r174672

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0e23893d66d8e61bf56bcc4a595cfa753b0434b..6493443e2c90f7a0b44abddbd9035071c4466872 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * config/sparc/sparc.c (output_return): Fix thinko in the output of an
+       EH return when delayed branches are disabled.
+
 2011-06-05  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        Backport from mainline

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 619faad38766c34a1bdf843cd47fa276218c09bc..f812e3cc1b5e05c132bc4c69ec99e31b04db457b 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4432,18 +4432,20 @@ output_return (rtx insn)
             machinery occupies the delay slot.  */
          gcc_assert (! final_sequence);
 
-         if (! flag_delayed_branch)
-           fputs ("\tadd\t%fp, %g1, %fp\n", asm_out_file);
-
-         if (TARGET_V9)
-           fputs ("\treturn\t%i7+8\n", asm_out_file);
-         else
-           fputs ("\trestore\n\tjmp\t%o7+8\n", asm_out_file);
+          if (flag_delayed_branch)
+           {
+             if (TARGET_V9)
+               fputs ("\treturn\t%i7+8\n", asm_out_file);
+             else
+               fputs ("\trestore\n\tjmp\t%o7+8\n", asm_out_file);
 
-         if (flag_delayed_branch)
-           fputs ("\t add\t%sp, %g1, %sp\n", asm_out_file);
+             fputs ("\t add\t%sp, %g1, %sp\n", asm_out_file);
+           }
          else
-           fputs ("\t nop\n", asm_out_file);
+           {
+             fputs ("\trestore\n\tadd\t%sp, %g1, %sp\n", asm_out_file);
+             fputs ("\tjmp\t%o7+8\n\t nop\n", asm_out_file);
+           }
        }
       else if (final_sequence)
        {