comparison src/share/vm/runtime/objectMonitor.cpp @ 14460:8a9bb7821e28

Merge
author kvn
date Wed, 19 Feb 2014 12:08:49 -0800
parents c025990068c4 75ef1a499665
children 28f281e8de1d
comparison
equal deleted inserted replaced
14360:e8ef156f0bc9 14460:8a9bb7821e28
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