Mercurial > hg > truffle
diff src/share/vm/runtime/os.cpp @ 14460:8a9bb7821e28
Merge
author | kvn |
---|---|
date | Wed, 19 Feb 2014 12:08:49 -0800 |
parents | e8ef156f0bc9 abec000618bf |
children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp Thu Feb 13 17:57:27 2014 +0100 +++ b/src/share/vm/runtime/os.cpp Wed Feb 19 12:08:49 2014 -0800 @@ -1101,7 +1101,7 @@ // if C stack is walkable beyond current frame. The check for fp() is not // necessary on Sparc, but it's harmless. bool os::is_first_C_frame(frame* fr) { -#if defined(IA64) && !defined(_WIN32) +#if (defined(IA64) && !defined(AIX)) && !defined(_WIN32) // On IA64 we have to check if the callers bsp is still valid // (i.e. within the register stack bounds). // Notice: this only works for threads created by the VM and only if