comparison src/share/vm/runtime/threadLocalStorage.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 f34d701e952e
children
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "runtime/thread.inline.hpp"
26 #include "runtime/threadLocalStorage.hpp" 27 #include "runtime/threadLocalStorage.hpp"
27 #ifdef TARGET_OS_FAMILY_linux 28 #ifdef TARGET_OS_FAMILY_linux
28 # include "os_linux.inline.hpp" 29 # include "os_linux.inline.hpp"
29 # include "thread_linux.inline.hpp"
30 #endif 30 #endif
31 #ifdef TARGET_OS_FAMILY_solaris 31 #ifdef TARGET_OS_FAMILY_solaris
32 # include "os_solaris.inline.hpp" 32 # include "os_solaris.inline.hpp"
33 # include "thread_solaris.inline.hpp"
34 #endif 33 #endif
35 #ifdef TARGET_OS_FAMILY_windows 34 #ifdef TARGET_OS_FAMILY_windows
36 # include "os_windows.inline.hpp" 35 # include "os_windows.inline.hpp"
37 # include "thread_windows.inline.hpp"
38 #endif 36 #endif
39 #ifdef TARGET_OS_FAMILY_bsd 37 #ifdef TARGET_OS_FAMILY_bsd
40 # include "os_bsd.inline.hpp" 38 # include "os_bsd.inline.hpp"
41 # include "thread_bsd.inline.hpp"
42 #endif 39 #endif
43 40
44 // static member initialization 41 // static member initialization
45 int ThreadLocalStorage::_thread_index = -1; 42 int ThreadLocalStorage::_thread_index = -1;
46 43