cfgcleanup.c (try_crossjump_to_edge): Only skip past NOTE_INSN_BASIC_BLOCK.

[gcc.git] / gcc / config / i386 / i386.md

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 3f56c89b387e9d9c866cbf9402d8844fb540516d..20413966e8423e5a491c25226c038825cb757ad6 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -101,7 +101,6 @@
    (UNSPEC_ADD_CARRY           34)
    (UNSPEC_FLDCW               35)
    (UNSPEC_REP                 36)
-   (UNSPEC_EH_RETURN           37)
    (UNSPEC_LD_MPIC             38)     ; load_macho_picbase
    (UNSPEC_TRUNC_NOOP          39)
 
@@ -15982,21 +15981,16 @@
   tmp = gen_rtx_MEM (Pmode, tmp);
   emit_move_insn (tmp, ra);
 
-  if (Pmode == SImode)
-    emit_jump_insn (gen_eh_return_si (sa));
-  else
-    emit_jump_insn (gen_eh_return_di (sa));
+  emit_jump_insn (gen_eh_return_internal ());
   emit_barrier ();
   DONE;
 })
 
-(define_insn_and_split "eh_return_<mode>"
-  [(set (pc)
-        (unspec [(match_operand:P 0 "register_operand" "c")]
-                UNSPEC_EH_RETURN))]
+(define_insn_and_split "eh_return_internal"
+  [(eh_return)]
   ""
   "#"
-  "reload_completed"
+  "epilogue_completed"
   [(const_int 0)]
   "ix86_expand_epilogue (2); DONE;")