提交 754447b7 编写于 作者: R rottenha

Merge

......@@ -1244,7 +1244,7 @@ IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, meth
// preparing the same method will be sure to see non-null entry & mirror.
IRT_END
#if defined(IA32) || defined(AMD64)
#if defined(IA32) || defined(AMD64) || defined(ARM)
IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address))
if (src_address == dest_address) {
return;
......
......@@ -141,8 +141,8 @@ class InterpreterRuntime: AllStatic {
methodOopDesc* method,
intptr_t* from, intptr_t* to);
#if defined(IA32) || defined(AMD64)
// Popframe support (only needed on x86 and AMD64)
#if defined(IA32) || defined(AMD64) || defined(ARM)
// Popframe support (only needed on x86, AMD64 and ARM)
static void popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address);
#endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册