Mercurial > hg > graal-jvmci-8
diff src/share/vm/memory/universe.cpp @ 7182:c24f778e9401
Merge
| author | johnc |
|---|---|
| date | Thu, 29 Nov 2012 11:23:15 -0800 |
| parents | 59c790074993 f34d701e952e |
| children | 5fafdef522c6 |
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp Wed Nov 28 17:50:21 2012 -0500 +++ b/src/share/vm/memory/universe.cpp Thu Nov 29 11:23:15 2012 -0800 @@ -62,6 +62,7 @@ #include "runtime/javaCalls.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/synchronizer.hpp" +#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "runtime/vm_operations.hpp" #include "services/memoryService.hpp" @@ -69,18 +70,6 @@ #include "utilities/events.hpp" #include "utilities/hashtable.inline.hpp" #include "utilities/preserveException.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 #ifndef SERIALGC #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"