diff src/cpu/x86/vm/stubGenerator_x86_64.cpp @ 7182:c24f778e9401

Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children d2f8c38e543d
line wrap: on
line diff
--- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Wed Nov 28 17:50:21 2012 -0500
+++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Nov 29 11:23:15 2012 -0800
@@ -37,19 +37,8 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
 #include "utilities/top.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
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif