Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/objectMonitor.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 | 1d1603768966 |
| children | 436b4a3231bf |
comparison
equal
deleted
inserted
replaced
| 3959:eda6988c0d81 | 3960:f08d439fab8c |
|---|---|
| 47 # include "thread_solaris.inline.hpp" | 47 # include "thread_solaris.inline.hpp" |
| 48 #endif | 48 #endif |
| 49 #ifdef TARGET_OS_FAMILY_windows | 49 #ifdef TARGET_OS_FAMILY_windows |
| 50 # include "os_windows.inline.hpp" | 50 # include "os_windows.inline.hpp" |
| 51 # include "thread_windows.inline.hpp" | 51 # include "thread_windows.inline.hpp" |
| 52 #endif | |
| 53 #ifdef TARGET_OS_FAMILY_bsd | |
| 54 # include "os_bsd.inline.hpp" | |
| 55 # include "thread_bsd.inline.hpp" | |
| 52 #endif | 56 #endif |
| 53 | 57 |
| 54 #if defined(__GNUC__) && !defined(IA64) | 58 #if defined(__GNUC__) && !defined(IA64) |
| 55 // Need to inhibit inlining for older versions of GCC to avoid build-time failures | 59 // Need to inhibit inlining for older versions of GCC to avoid build-time failures |
| 56 #define ATTR __attribute__((noinline)) | 60 #define ATTR __attribute__((noinline)) |