diff src/share/vm/runtime/objectMonitor.cpp @ 14456:abec000618bf

Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents 75ef1a499665
children 8a9bb7821e28 bbfbe9b06038
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.cpp	Tue Jan 28 11:21:43 2014 -0800
+++ b/src/share/vm/runtime/objectMonitor.cpp	Tue Jan 28 12:25:34 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