Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/objectMonitor.cpp @ 14465:28f281e8de1d
Merge
author | kvn |
---|---|
date | Thu, 20 Feb 2014 12:20:56 -0800 |
parents | e6195383bcaf 8a9bb7821e28 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14382:805784307dca | 14465:28f281e8de1d |
---|---|
52 #endif | 52 #endif |
53 #ifdef TARGET_OS_FAMILY_bsd | 53 #ifdef TARGET_OS_FAMILY_bsd |
54 # include "os_bsd.inline.hpp" | 54 # include "os_bsd.inline.hpp" |
55 #endif | 55 #endif |
56 | 56 |
57 #if defined(__GNUC__) && !defined(IA64) | 57 #if defined(__GNUC__) && !defined(IA64) && !defined(PPC64) |
58 // Need to inhibit inlining for older versions of GCC to avoid build-time failures | 58 // Need to inhibit inlining for older versions of GCC to avoid build-time failures |
59 #define ATTR __attribute__((noinline)) | 59 #define ATTR __attribute__((noinline)) |
60 #else | 60 #else |
61 #define ATTR | 61 #define ATTR |
62 #endif | 62 #endif |