Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/javaCalls.cpp @ 7182:c24f778e9401

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children 291ffc492eb6 190899198332
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp	Wed Nov 28 17:50:21 2012 -0500
+++ b/src/share/vm/runtime/javaCalls.cpp	Thu Nov 29 11:23:15 2012 -0800
@@ -39,18 +39,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.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
+#include "runtime/thread.inline.hpp"
 
 // -----------------------------------------------------
 // Implementation of JavaCallWrapper