Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/os.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | f34d701e952e |
children | 291ffc492eb6 9fae07c31641 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
42 #include "runtime/java.hpp" | 42 #include "runtime/java.hpp" |
43 #include "runtime/javaCalls.hpp" | 43 #include "runtime/javaCalls.hpp" |
44 #include "runtime/mutexLocker.hpp" | 44 #include "runtime/mutexLocker.hpp" |
45 #include "runtime/os.hpp" | 45 #include "runtime/os.hpp" |
46 #include "runtime/stubRoutines.hpp" | 46 #include "runtime/stubRoutines.hpp" |
47 #include "runtime/thread.inline.hpp" | |
47 #include "services/attachListener.hpp" | 48 #include "services/attachListener.hpp" |
48 #include "services/memTracker.hpp" | 49 #include "services/memTracker.hpp" |
49 #include "services/threadService.hpp" | 50 #include "services/threadService.hpp" |
50 #include "utilities/defaultStream.hpp" | 51 #include "utilities/defaultStream.hpp" |
51 #include "utilities/events.hpp" | 52 #include "utilities/events.hpp" |
52 #ifdef TARGET_OS_FAMILY_linux | 53 #ifdef TARGET_OS_FAMILY_linux |
53 # include "os_linux.inline.hpp" | 54 # include "os_linux.inline.hpp" |
54 # include "thread_linux.inline.hpp" | |
55 #endif | 55 #endif |
56 #ifdef TARGET_OS_FAMILY_solaris | 56 #ifdef TARGET_OS_FAMILY_solaris |
57 # include "os_solaris.inline.hpp" | 57 # include "os_solaris.inline.hpp" |
58 # include "thread_solaris.inline.hpp" | |
59 #endif | 58 #endif |
60 #ifdef TARGET_OS_FAMILY_windows | 59 #ifdef TARGET_OS_FAMILY_windows |
61 # include "os_windows.inline.hpp" | 60 # include "os_windows.inline.hpp" |
62 # include "thread_windows.inline.hpp" | |
63 #endif | 61 #endif |
64 #ifdef TARGET_OS_FAMILY_bsd | 62 #ifdef TARGET_OS_FAMILY_bsd |
65 # include "os_bsd.inline.hpp" | 63 # include "os_bsd.inline.hpp" |
66 # include "thread_bsd.inline.hpp" | |
67 #endif | 64 #endif |
68 | 65 |
69 # include <signal.h> | 66 # include <signal.h> |
70 | 67 |
71 OSThread* os::_starting_thread = NULL; | 68 OSThread* os::_starting_thread = NULL; |