# HG changeset patch
# User rottenha
# Date 1315488991 25200
# Node ID 5c4fac522301e8bf1b0c7f7149f155c2f1a17f03
# Parent  fb373fa38321175d5b598e61e0bb462970455b21# Parent  db9177a52cee9cef9862a6dbace1ce7e582c67db
Merge

diff -r fb373fa38321 -r 5c4fac522301 hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Sep 07 11:52:00 2011 -0700
+++ b/hotspot/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;
diff -r fb373fa38321 -r 5c4fac522301 hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	Wed Sep 07 11:52:00 2011 -0700
+++ b/hotspot/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