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

+  insn_start_frag = frag_now;
+
+  if (nacl_alignment > 0) {
+    frag_align_code(0, 0);
+  }
+
   /* Tie dwarf2 debug info to the address at the start of the insn.

 	}
     }
   else
@@ -5560,19 +5652,264 @@
 }
 
 static void
