Mercurial > hg > arm32-8
changeset 7241:6d13c17668d1
8055231: ZERO variant build is broken
Summary: Fix zero build.
Reviewed-by: coleenp
Contributed-by: Severin Gehwolf <sgehwolf@redhat.com>
| author | coleenp |
|---|---|
| date | Fri, 15 Aug 2014 15:25:24 -0400 |
| parents | 12eb26c15642 |
| children | db9fdbb055c4 |
| files | src/cpu/zero/vm/cppInterpreter_zero.cpp src/cpu/zero/vm/frame_zero.inline.hpp src/share/vm/interpreter/bytecodeInterpreter.cpp |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Mar 31 16:12:22 2015 +0000 +++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri Aug 15 15:25:24 2014 -0400 @@ -730,7 +730,7 @@ if (method->is_static()) object = method->constants()->pool_holder()->java_mirror(); else - object = (oop) locals[0]; + object = (oop) (void*)locals[0]; monitor->set_obj(object); }
--- a/src/cpu/zero/vm/frame_zero.inline.hpp Tue Mar 31 16:12:22 2015 +0000 +++ b/src/cpu/zero/vm/frame_zero.inline.hpp Fri Aug 15 15:25:24 2014 -0400 @@ -26,6 +26,8 @@ #ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP #define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP +#include "code/codeCache.hpp" + // Constructors inline frame::frame() {
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Mar 31 16:12:22 2015 +0000 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Aug 15 15:25:24 2014 -0400 @@ -3432,7 +3432,7 @@ tty->print_cr("osr._osr_buf: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_buf); tty->print_cr("osr._osr_entry: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_entry); tty->print_cr("prev_link: " INTPTR_FORMAT, (uintptr_t) this->_prev_link); - tty->print_cr("native_mirror: " INTPTR_FORMAT, (uintptr_t) this->_oop_temp); + tty->print_cr("native_mirror: " INTPTR_FORMAT, (uintptr_t) p2i(this->_oop_temp)); tty->print_cr("stack_base: " INTPTR_FORMAT, (uintptr_t) this->_stack_base); tty->print_cr("stack_limit: " INTPTR_FORMAT, (uintptr_t) this->_stack_limit); tty->print_cr("monitor_base: " INTPTR_FORMAT, (uintptr_t) this->_monitor_base);