OpenJDK / bsd-port / bsd-port / hotspot
changeset 2916:5596e125fe4f
Merge
| author | rottenha |
|---|---|
| date | Thu, 08 Sep 2011 06:36:31 -0700 |
| parents | d968f546734e 2fecca53a2c6 |
| children | e984655be425 |
| files | src/share/vm/interpreter/interpreterRuntime.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Wed Sep 07 11:52:00 2011 -0700 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Thu Sep 08 06:36:31 2011 -0700 @@ -1244,7 +1244,7 @@ // 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;
--- a/src/share/vm/interpreter/interpreterRuntime.hpp Wed Sep 07 11:52:00 2011 -0700 +++ b/src/share/vm/interpreter/interpreterRuntime.hpp Thu Sep 08 06:36:31 2011 -0700 @@ -141,8 +141,8 @@ 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