infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-26 05:18:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Robert Ottenhag 2011-09-08 06:36:31 -07:00
commit b62fb1de97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
View File

@ -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;

4
hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
View File

@ -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