Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.cpp Mon Mar 24 10:48:44 2014 -0700 +++ b/src/share/vm/runtime/objectMonitor.cpp Wed Mar 26 18:21:05 2014 -0700 @@ -54,7 +54,7 @@ # include "os_bsd.inline.hpp" #endif -#if defined(__GNUC__) && !defined(IA64) +#if defined(__GNUC__) && !defined(IA64) && !defined(PPC64) // Need to inhibit inlining for older versions of GCC to avoid build-time failures #define ATTR __attribute__((noinline)) #else