Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/cpu/zero/vm/interp_masm_zero.cpp Fri Dec 14 14:53:42 2012 +0100 +++ b/src/cpu/zero/vm/interp_masm_zero.cpp Fri Dec 14 15:19:38 2012 +0100 @@ -37,11 +37,6 @@ #include "runtime/basicLock.hpp" #include "runtime/biasedLocking.hpp" #include "runtime/sharedRuntime.hpp" -#ifdef TARGET_OS_FAMILY_linux -# include "thread_linux.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_bsd -# include "thread_bsd.inline.hpp" -#endif +#include "runtime/thread.inline.hpp" // This file is intentionally empty