Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorrottenha
Thu, 08 Sep 2011 06:36:31 -0700
changeset 10521 5c4fac522301
parent 10519 fb373fa38321 (current diff)
parent 10520 db9177a52cee (diff)
child 10531 ec78e506afa8
Merge
hotspot/src/share/vm/interpreter/interpreterRuntime.cpp file | annotate | diff | comparison | revisions 
--- 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;
--- 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
jdk-sandbox