Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | 7c15faa95ce7 f34d701e952e |
children | 5505fbbae3d3 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
93 #include "runtime/javaCalls.hpp" | 93 #include "runtime/javaCalls.hpp" |
94 #include "runtime/perfMemory.hpp" | 94 #include "runtime/perfMemory.hpp" |
95 #include "runtime/serviceThread.hpp" | 95 #include "runtime/serviceThread.hpp" |
96 #include "runtime/sharedRuntime.hpp" | 96 #include "runtime/sharedRuntime.hpp" |
97 #include "runtime/stubRoutines.hpp" | 97 #include "runtime/stubRoutines.hpp" |
98 #include "runtime/thread.inline.hpp" | |
98 #include "runtime/virtualspace.hpp" | 99 #include "runtime/virtualspace.hpp" |
99 #include "runtime/vmStructs.hpp" | 100 #include "runtime/vmStructs.hpp" |
100 #include "utilities/array.hpp" | 101 #include "utilities/array.hpp" |
101 #include "utilities/globalDefinitions.hpp" | 102 #include "utilities/globalDefinitions.hpp" |
102 #include "utilities/hashtable.hpp" | 103 #include "utilities/hashtable.hpp" |
112 #ifdef TARGET_ARCH_arm | 113 #ifdef TARGET_ARCH_arm |
113 # include "vmStructs_arm.hpp" | 114 # include "vmStructs_arm.hpp" |
114 #endif | 115 #endif |
115 #ifdef TARGET_ARCH_ppc | 116 #ifdef TARGET_ARCH_ppc |
116 # include "vmStructs_ppc.hpp" | 117 # include "vmStructs_ppc.hpp" |
117 #endif | |
118 #ifdef TARGET_OS_FAMILY_linux | |
119 # include "thread_linux.inline.hpp" | |
120 #endif | |
121 #ifdef TARGET_OS_FAMILY_solaris | |
122 # include "thread_solaris.inline.hpp" | |
123 #endif | |
124 #ifdef TARGET_OS_FAMILY_windows | |
125 # include "thread_windows.inline.hpp" | |
126 #endif | |
127 #ifdef TARGET_OS_FAMILY_bsd | |
128 # include "thread_bsd.inline.hpp" | |
129 #endif | 118 #endif |
130 #ifdef TARGET_OS_ARCH_linux_x86 | 119 #ifdef TARGET_OS_ARCH_linux_x86 |
131 # include "vmStructs_linux_x86.hpp" | 120 # include "vmStructs_linux_x86.hpp" |
132 #endif | 121 #endif |
133 #ifdef TARGET_OS_ARCH_linux_sparc | 122 #ifdef TARGET_OS_ARCH_linux_sparc |