diff 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
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.cpp	Tue Feb 18 09:54:24 2014 -0500
+++ b/src/share/vm/runtime/objectMonitor.cpp	Thu Feb 20 12:20:56 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