Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/interp_masm_x86_64.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | 5d0bb7d52783 f34d701e952e |
children | c76b43ed5089 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
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 #ifdef TARGET_OS_FAMILY_windows | |
46 # include "thread_windows.inline.hpp" | |
47 #endif | |
48 #ifdef TARGET_OS_FAMILY_bsd | |
49 # include "thread_bsd.inline.hpp" | |
50 #endif | |
51 | 40 |
52 | 41 |
53 // Implementation of InterpreterMacroAssembler | 42 // Implementation of InterpreterMacroAssembler |
54 | 43 |
55 #ifdef CC_INTERP | 44 #ifdef CC_INTERP |