diff src/share/vm/runtime/os.cpp @ 14403:75ef1a499665

8019973: PPC64 (part 11): Fix IA64 preprocessor conditionals on AIX. Summary: On AIX 7.1 systemcfg.h defines IA64 unconditionally, so test for !AIX where IA64 is used. Reviewed-by: dholmes, kvn
author goetz
date Fri, 05 Jul 2013 22:17:47 +0200
parents 1f4355cee9a2
children 94c202aa2646
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp	Wed Jul 10 09:14:25 2013 -0700
+++ b/src/share/vm/runtime/os.cpp	Fri Jul 05 22:17:47 2013 +0200
@@ -1020,7 +1020,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