 +     * alignment.  During writing of the object we swap the nops before the
 +     * instruction.
 +     */
-+    if (frag_is_a_call()) {
++    if (frag_is_a_call ()) {
 +      frag_now->is_call = 1;
-+      frag_align_code(call_align,0);
++      frag_align_code (call_align,0);
 +    }
 +  }
  }
  
  /* Return the size of the displacement operand N.  */
-@@ -6858,8 +7323,44 @@
+@@ -6858,8 +7296,44 @@
      }
    else if (*op_string == REGISTER_PREFIX)
      {

 
+  if (nacl_alignment > 0) {
+    if (!strcmp(i.tm.name, "naclcall")) {
+      insert_sandbox_jmp();
+    }
+    else if (!strcmp(i.tm.name, "nacljmp")) {
+      insert_sandbox_jmp();
+    }
+  }
+
   /* Output jumps.  */
   if (i.tm.opcode_modifier.jump)
     output_branch ();
@@ -5612,10 +5984,10 @@
 		      if (prefix != REPE_PREFIX_OPCODE
 			  || (i.prefix[LOCKREP_PREFIX]
 			      != REPE_PREFIX_OPCODE))

     default:
       return 0;
     }
@@ -8597,4 +9089,25 @@
       bss_section = saved_bss_section;
     }
 }
