Mercurial > hg > graal-compiler
comparison src/cpu/zero/vm/interp_masm_zero.cpp @ 7232:310a68c63b69
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 15:19:38 +0100 |
parents | f34d701e952e |
children |
comparison
equal
deleted
inserted
replaced
7231:c0806f4ff3ea | 7232:310a68c63b69 |
---|---|
35 #include "prims/jvmtiRedefineClassesTrace.hpp" | 35 #include "prims/jvmtiRedefineClassesTrace.hpp" |
36 #include "prims/jvmtiThreadState.hpp" | 36 #include "prims/jvmtiThreadState.hpp" |
37 #include "runtime/basicLock.hpp" | 37 #include "runtime/basicLock.hpp" |
38 #include "runtime/biasedLocking.hpp" | 38 #include "runtime/biasedLocking.hpp" |
39 #include "runtime/sharedRuntime.hpp" | 39 #include "runtime/sharedRuntime.hpp" |
40 #ifdef TARGET_OS_FAMILY_linux | 40 #include "runtime/thread.inline.hpp" |
41 # include "thread_linux.inline.hpp" | |
42 #endif | |
43 #ifdef TARGET_OS_FAMILY_bsd | |
44 # include "thread_bsd.inline.hpp" | |
45 #endif | |
46 | 41 |
47 // This file is intentionally empty | 42 // This file is intentionally empty |