Mercurial > hg > truffle

diff src/share/vm/runtime/os.cpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 752ba2e5f6d0
children 5cf196cc5405
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp	Mon Mar 24 10:48:44 2014 -0700
+++ b/src/share/vm/runtime/os.cpp	Wed Mar 26 18:21:05 2014 -0700
@@ -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