Mercurial > hg > graal-compiler
comparison src/share/vm/utilities/debug.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 | 679e6584c177 f34d701e952e |
children | 989155e2d07a |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
42 #include "runtime/frame.hpp" | 42 #include "runtime/frame.hpp" |
43 #include "runtime/java.hpp" | 43 #include "runtime/java.hpp" |
44 #include "runtime/sharedRuntime.hpp" | 44 #include "runtime/sharedRuntime.hpp" |
45 #include "runtime/stubCodeGenerator.hpp" | 45 #include "runtime/stubCodeGenerator.hpp" |
46 #include "runtime/stubRoutines.hpp" | 46 #include "runtime/stubRoutines.hpp" |
47 #include "runtime/thread.inline.hpp" | |
47 #include "runtime/vframe.hpp" | 48 #include "runtime/vframe.hpp" |
48 #include "services/heapDumper.hpp" | 49 #include "services/heapDumper.hpp" |
49 #include "utilities/defaultStream.hpp" | 50 #include "utilities/defaultStream.hpp" |
50 #include "utilities/events.hpp" | 51 #include "utilities/events.hpp" |
51 #include "utilities/top.hpp" | 52 #include "utilities/top.hpp" |
52 #include "utilities/vmError.hpp" | 53 #include "utilities/vmError.hpp" |
53 #ifdef TARGET_OS_FAMILY_linux | 54 #ifdef TARGET_OS_FAMILY_linux |
54 # include "os_linux.inline.hpp" | 55 # include "os_linux.inline.hpp" |
55 # include "thread_linux.inline.hpp" | |
56 #endif | 56 #endif |
57 #ifdef TARGET_OS_FAMILY_solaris | 57 #ifdef TARGET_OS_FAMILY_solaris |
58 # include "os_solaris.inline.hpp" | 58 # include "os_solaris.inline.hpp" |
59 # include "thread_solaris.inline.hpp" | |
60 #endif | 59 #endif |
61 #ifdef TARGET_OS_FAMILY_windows | 60 #ifdef TARGET_OS_FAMILY_windows |
62 # include "os_windows.inline.hpp" | 61 # include "os_windows.inline.hpp" |
63 # include "thread_windows.inline.hpp" | |
64 #endif | 62 #endif |
65 #ifdef TARGET_OS_FAMILY_bsd | 63 #ifdef TARGET_OS_FAMILY_bsd |
66 # include "os_bsd.inline.hpp" | 64 # include "os_bsd.inline.hpp" |
67 # include "thread_bsd.inline.hpp" | |
68 #endif | 65 #endif |
69 | 66 |
70 #ifndef ASSERT | 67 #ifndef ASSERT |
71 # ifdef _DEBUG | 68 # ifdef _DEBUG |
72 // NOTE: don't turn the lines below into a comment -- if you're getting | 69 // NOTE: don't turn the lines below into a comment -- if you're getting |