--- a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp	Wed Oct 21 18:34:36 2015 -0400
+++ b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp	Wed Oct 21 12:15:37 2015 +0000
@@ -60,7 +60,7 @@
 
 // ----------------------------------------------------------------------------
 
-address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
   ShouldNotReachHere(); // Only needed for COMPILER2.
   return NULL;
 }

--- a/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Wed Oct 21 18:34:36 2015 -0400
+++ b/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Wed Oct 21 12:15:37 2015 +0000
@@ -59,11 +59,6 @@
   ShouldNotCallThis();
 }
 
-void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src,
-                                                       CodeBuffer*       dst) {
-  ShouldNotCallThis();
-}
-
 void metadata_Relocation::pd_fix_value(address x) {
   ShouldNotCallThis();
 }

--- a/hotspot/src/cpu/zero/vm/vm_version_zero.cpp	Wed Oct 21 18:34:36 2015 -0400
+++ b/hotspot/src/cpu/zero/vm/vm_version_zero.cpp	Wed Oct 21 12:15:37 2015 +0000
@@ -37,4 +37,5 @@
     warning("Unaligned memory access is not available on this CPU");
     FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
   }
+  FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
 }