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: r174670

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1f2a35529bb6f4e2df53edd5400f4b5b88f49ca..98e1c08fec5f3803ffc88d2c6bd4ec45ca67297d 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  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md (*movdf_internal_rex64) <case 8,9,10>:

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index d5d043def0f3127fdf5808710118f6eef5587ed3..59738af89ac5e14756a5144b633dc666d14ad669 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4752,18 +4752,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)
        {