    emit_insn (gen_rtx_SET (VOIDmode, op0, op1));
  }
  
-@@ -19048,7 +19313,7 @@
+@@ -19048,7 +19314,7 @@
  {
    int i;
  

     {
       /* This symbol may be referenced via a displacement from the PIC
 	 base address (@GOTOFF).  */
@@ -9573,14 +9766,14 @@
 	addr = XEXP (addr, 0);
       if (GET_CODE (addr) == PLUS)
 	  {

 
   if (NEED_INDICATE_EXEC_STACK)
     file_end_indicate_exec_stack ();
@@ -8602,8 +8631,9 @@
 					    + frame.padding0),
 				   style);
       /* If not an i386, mov & pop is faster than "leave".  */
-      else if (TARGET_USE_LEAVE || optimize_function_for_size_p (cfun)
-	       || !cfun->machine->use_fast_prologue_epilogue)
+      else if (!flag_control_integrity &&
+               (TARGET_USE_LEAVE || optimize_function_for_size_p (cfun)
+	       || !cfun->machine->use_fast_prologue_epilogue))
 	emit_insn ((*ix86_gen_leave) ());
       else
 	{
@@ -8688,6 +8718,8 @@
   if (style == 0)
     return;
 
