Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/vmThread.hpp @ 7182:c24f778e9401
Merge
| author | johnc |
|---|---|
| date | Thu, 29 Nov 2012 11:23:15 -0800 |
| parents | f34d701e952e |
| children | be0ac0e8f6e7 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmThread.hpp Wed Nov 28 17:50:21 2012 -0500 +++ b/src/share/vm/runtime/vmThread.hpp Thu Nov 29 11:23:15 2012 -0800 @@ -26,19 +26,8 @@ #define SHARE_VM_RUNTIME_VMTHREAD_HPP #include "runtime/perfData.hpp" +#include "runtime/thread.inline.hpp" #include "runtime/vm_operations.hpp" -#ifdef TARGET_OS_FAMILY_linux -# include "thread_linux.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_solaris -# include "thread_solaris.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_windows -# include "thread_windows.inline.hpp" -#endif -#ifdef TARGET_OS_FAMILY_bsd -# include "thread_bsd.inline.hpp" -#endif // // Prioritized queue of VM operations. @@ -137,7 +126,7 @@ static VMThread* vm_thread() { return _vm_thread; } // GC support - void oops_do(OopClosure* f, CodeBlobClosure* cf); + void oops_do(OopClosure* f, CLDToOopClosure* cld_f, CodeBlobClosure* cf); // Debugging void print_on(outputStream* st) const;