--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	Fri Nov 27 09:36:46 2015 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Oct 05 23:53:59 2015 +0200
@@ -36,7 +36,7 @@
   // We must have enough patching space so that call can be inserted.
   // We cannot use fat nops here, since the concurrent code rewrite may transiently
   // create the illegal instruction sequence.
-  while ((intx) _masm->pc() - (intx) patch->pc_start() < NativeCall::instruction_size) {
+  while ((intx) _masm->pc() - (intx) patch->pc_start() < NativeGeneralJump::instruction_size) {
     _masm->nop();
   }
   patch->install(_masm, patch_code, obj, info);

--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Fri Nov 27 09:36:46 2015 +0100
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Mon Oct 05 23:53:59 2015 +0200
@@ -1163,7 +1163,7 @@
           }
 #endif
 
-          for (int i = NativeCall::instruction_size; i < *byte_count; i++) {
+          for (int i = NativeGeneralJump::instruction_size; i < *byte_count; i++) {
             address ptr = copy_buff + i;
             int a_byte = (*ptr) & 0xFF;
             address dst = instr_pc + i;