comparison src/share/vm/runtime/synchronizer.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 3ac7d10a6572 9fae07c31641
children b9a918201d47
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
51 #endif 51 #endif
52 #ifdef TARGET_OS_FAMILY_bsd 52 #ifdef TARGET_OS_FAMILY_bsd
53 # include "os_bsd.inline.hpp" 53 # include "os_bsd.inline.hpp"
54 #endif 54 #endif
55 55
56 #if defined(__GNUC__) && !defined(IA64) 56 #if defined(__GNUC__)
57 // Need to inhibit inlining for older versions of GCC to avoid build-time failures 57 // Need to inhibit inlining for older versions of GCC to avoid build-time failures
58 #define ATTR __attribute__((noinline)) 58 #define ATTR __attribute__((noinline))
59 #else 59 #else
60 #define ATTR 60 #define ATTR
61 #endif 61 #endif