Recent changes introduced a couple of Zero build problems:

1)
hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:63:77: error: no ‘void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer*, CodeBuffer*)’ member function declared in class ‘poll_return_Relocation’
                                                        CodeBuffer* dst) {
                                                                             ^
hotspot/make/linux/makefiles/rules.make:156: recipe for target 'relocInfo_zero.o' failed
gmake[8]: *** [relocInfo_zero.o] Error 1

2)
hotspot/src/cpu/zero/vm/compiledIC_zero.cpp:63:9: error: prototype for ‘u_char* CompiledStaticCall::emit_to_interp_stub(CodeBuffer&)’ does not match any in class ‘CompiledStaticCall’
 address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
         ^
In file included from [...]/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp:28:0:
[...]/hotspot/src/share/vm/code/compiledIC.hpp:309:18: error: candidate is: static u_char* CompiledStaticCall::emit_to_interp_stub(CodeBuffer&, address)
   static address emit_to_interp_stub(CodeBuffer &cbuf, address mark = NULL);
                  ^
hotspot/make/linux/makefiles/rules.make:156: recipe for target 'compiledIC_zero.o' failed

3)
hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp: In static member function ‘static void BytecodeInterpreter::run(interpreterState)’:
hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp:2193:33: error: ‘k_entry’ was not declared in this scope
               result->set_klass(k_entry);
                                 ^
hotspot/make/linux/makefiles/rules.make:156: recipe for target 'bytecodeInterpreter.o' failed
gmake[8]: *** [bytecodeInterpreter.o] Error 1