Mercurial > hg > truffle
comparison src/share/vm/oops/oop.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
| author | never |
|---|---|
| date | Sun, 25 Sep 2011 16:03:29 -0700 |
| parents | f95d63e2154a |
| children | b632e80fc9dc |
comparison
equal
deleted
inserted
replaced
| 3959:eda6988c0d81 | 3960:f08d439fab8c |
|---|---|
| 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; |