Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/synchronizer.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | 2cb439954abf f34d701e952e |
children | 3ac7d10a6572 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
34 #include "runtime/objectMonitor.hpp" | 34 #include "runtime/objectMonitor.hpp" |
35 #include "runtime/objectMonitor.inline.hpp" | 35 #include "runtime/objectMonitor.inline.hpp" |
36 #include "runtime/osThread.hpp" | 36 #include "runtime/osThread.hpp" |
37 #include "runtime/stubRoutines.hpp" | 37 #include "runtime/stubRoutines.hpp" |
38 #include "runtime/synchronizer.hpp" | 38 #include "runtime/synchronizer.hpp" |
39 #include "runtime/thread.inline.hpp" | |
39 #include "utilities/dtrace.hpp" | 40 #include "utilities/dtrace.hpp" |
40 #include "utilities/events.hpp" | 41 #include "utilities/events.hpp" |
41 #include "utilities/preserveException.hpp" | 42 #include "utilities/preserveException.hpp" |
42 #ifdef TARGET_OS_FAMILY_linux | 43 #ifdef TARGET_OS_FAMILY_linux |
43 # include "os_linux.inline.hpp" | 44 # include "os_linux.inline.hpp" |
44 # include "thread_linux.inline.hpp" | |
45 #endif | 45 #endif |
46 #ifdef TARGET_OS_FAMILY_solaris | 46 #ifdef TARGET_OS_FAMILY_solaris |
47 # include "os_solaris.inline.hpp" | 47 # include "os_solaris.inline.hpp" |
48 # include "thread_solaris.inline.hpp" | |
49 #endif | 48 #endif |
50 #ifdef TARGET_OS_FAMILY_windows | 49 #ifdef TARGET_OS_FAMILY_windows |
51 # include "os_windows.inline.hpp" | 50 # include "os_windows.inline.hpp" |
52 # include "thread_windows.inline.hpp" | |
53 #endif | 51 #endif |
54 #ifdef TARGET_OS_FAMILY_bsd | 52 #ifdef TARGET_OS_FAMILY_bsd |
55 # include "os_bsd.inline.hpp" | 53 # include "os_bsd.inline.hpp" |
56 # include "thread_bsd.inline.hpp" | |
57 #endif | 54 #endif |
58 | 55 |
59 #if defined(__GNUC__) && !defined(IA64) | 56 #if defined(__GNUC__) && !defined(IA64) |
60 // Need to inhibit inlining for older versions of GCC to avoid build-time failures | 57 // Need to inhibit inlining for older versions of GCC to avoid build-time failures |
61 #define ATTR __attribute__((noinline)) | 58 #define ATTR __attribute__((noinline)) |