diff src/cpu/zero/vm/stubGenerator_zero.cpp @ 7232:310a68c63b69

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 15:19:38 +0100
parents f34d701e952e
children c54a3122f9c8
line wrap: on
line diff
--- a/src/cpu/zero/vm/stubGenerator_zero.cpp	Fri Dec 14 14:53:42 2012 +0100
+++ b/src/cpu/zero/vm/stubGenerator_zero.cpp	Fri Dec 14 15:19:38 2012 +0100
@@ -38,14 +38,9 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
 #include "stack_zero.inline.hpp"
 #include "utilities/top.hpp"
-#ifdef TARGET_OS_FAMILY_linux
-# include "thread_linux.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_bsd
-# include "thread_bsd.inline.hpp"
-#endif
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif