diff 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
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.cpp	Thu Feb 13 17:57:27 2014 +0100
+++ b/src/share/vm/runtime/objectMonitor.cpp	Wed Feb 19 12:08:49 2014 -0800
@@ -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