comparison src/share/vm/oops/oop.cpp @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents f08d439fab8c
children b632e80fc9dc
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
33 #ifdef TARGET_OS_FAMILY_solaris 33 #ifdef TARGET_OS_FAMILY_solaris
34 # include "thread_solaris.inline.hpp" 34 # include "thread_solaris.inline.hpp"
35 #endif 35 #endif
36 #ifdef TARGET_OS_FAMILY_windows 36 #ifdef TARGET_OS_FAMILY_windows
37 # include "thread_windows.inline.hpp" 37 # include "thread_windows.inline.hpp"
38 #endif
39 #ifdef TARGET_OS_FAMILY_bsd
40 # include "thread_bsd.inline.hpp"
38 #endif 41 #endif
39 42
40 bool always_do_update_barrier = false; 43 bool always_do_update_barrier = false;
41 44
42 BarrierSet* oopDesc::_bs = NULL; 45 BarrierSet* oopDesc::_bs = NULL;