Mercurial > hg > truffle
comparison src/share/vm/runtime/objectMonitor.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | 8c6165f9ea8e bbfbe9b06038 |
children | 4a1062dc52d1 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
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 |