Merge

Thu, 08 Sep 2011 06:36:31 -0700

author
rottenha
date
Thu, 08 Sep 2011 06:36:31 -0700
changeset 3112
5596e125fe4f
parent 3110
d968f546734e
parent 3111
2fecca53a2c6
child 3122
e984655be425

Merge

src/share/vm/interpreter/interpreterRuntime.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp	Wed Sep 07 11:52:00 2011 -0700
     1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Sep 08 06:36:31 2011 -0700
     1.3 @@ -1244,7 +1244,7 @@
     1.4    // preparing the same method will be sure to see non-null entry & mirror.
     1.5  IRT_END
     1.6  
     1.7 -#if defined(IA32) || defined(AMD64)
     1.8 +#if defined(IA32) || defined(AMD64) || defined(ARM)
     1.9  IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address))
    1.10    if (src_address == dest_address) {
    1.11      return;
     2.1 --- a/src/share/vm/interpreter/interpreterRuntime.hpp	Wed Sep 07 11:52:00 2011 -0700
     2.2 +++ b/src/share/vm/interpreter/interpreterRuntime.hpp	Thu Sep 08 06:36:31 2011 -0700
     2.3 @@ -141,8 +141,8 @@
     2.4                                          methodOopDesc* method,
     2.5                                          intptr_t* from, intptr_t* to);
     2.6  
     2.7 -#if defined(IA32) || defined(AMD64)
     2.8 -  // Popframe support (only needed on x86 and AMD64)
     2.9 +#if defined(IA32) || defined(AMD64) || defined(ARM)
    2.10 +  // Popframe support (only needed on x86, AMD64 and ARM)
    2.11    static void popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address);
    2.12  #endif
    2.13  

mercurial