comparison src/cpu/sparc/vm/interp_masm_sparc.cpp @ 7182:c24f778e9401

Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children 5505fbbae3d3
comparison
equal deleted inserted replaced
7176:59c790074993 7182:c24f778e9401
34 #include "prims/jvmtiRedefineClassesTrace.hpp" 34 #include "prims/jvmtiRedefineClassesTrace.hpp"
35 #include "prims/jvmtiThreadState.hpp" 35 #include "prims/jvmtiThreadState.hpp"
36 #include "runtime/basicLock.hpp" 36 #include "runtime/basicLock.hpp"
37 #include "runtime/biasedLocking.hpp" 37 #include "runtime/biasedLocking.hpp"
38 #include "runtime/sharedRuntime.hpp" 38 #include "runtime/sharedRuntime.hpp"
39 #ifdef TARGET_OS_FAMILY_linux 39 #include "runtime/thread.inline.hpp"
40 # include "thread_linux.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_solaris
43 # include "thread_solaris.inline.hpp"
44 #endif
45 40
46 #ifndef CC_INTERP 41 #ifndef CC_INTERP
47 #ifndef FAST_DISPATCH 42 #ifndef FAST_DISPATCH
48 #define FAST_DISPATCH 1 43 #define FAST_DISPATCH 1
49 #endif 44 #endif