Mercurial > hg > release > icedtea7-forest-2.6 > hotspot

changeset 6481:4b0ce9977f3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 Mon, 10 Feb 2014 10:47:51 +0100
parents 33e70139574f
children e37038685e3f
files src/share/vm/opto/generateOptoStub.cpp src/share/vm/prims/forte.cpp src/share/vm/runtime/os.cpp
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/generateOptoStub.cpp	Mon Feb 10 10:34:59 2014 +0100
+++ b/src/share/vm/opto/generateOptoStub.cpp	Mon Feb 10 10:47:51 2014 +0100
@@ -235,7 +235,7 @@
 #if defined(SPARC) || (defined(IA64) && !defined(AIX))
   store_to_memory(NULL, adr_flags, intcon(0), T_INT, NoAlias);
 #endif
-#if defined(IA64) && !defined(AIX)
+#if (defined(IA64) && !defined(AIX))
   Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset()));
   store_to_memory(NULL, adr_last_Java_fp, null(), T_ADDRESS, NoAlias);
 #endif
--- a/src/share/vm/prims/forte.cpp	Mon Feb 10 10:34:59 2014 +0100
+++ b/src/share/vm/prims/forte.cpp	Mon Feb 10 10:47:51 2014 +0100
@@ -56,7 +56,7 @@
 // Native interfaces for use by Forte tools.
 
 
-#if !defined(IA64) || defined(AIX)
+#if !defined(IA64) && !defined(PPC64)
 
 class vframeStreamForte : public vframeStreamCommon {
  public:
@@ -626,7 +626,7 @@
 // Method to let libcollector know about a dynamically loaded function.
 // Because it is weakly bound, the calls become NOP's when the library
 // isn't present.
-#if defined(__APPLE__) || defined(AIX)
+#ifdef __APPLE__
 // XXXDARWIN: Link errors occur even when __attribute__((weak_import))
 // is added
 #define collector_func_load(x0,x1,x2,x3,x4,x5,x6) (0)
@@ -645,14 +645,14 @@
 #endif // !_WINDOWS
 
 } // end extern "C"
-#endif // !IA64
+#endif // !IA64 && !PPC64
 
 void Forte::register_stub(const char* name, address start, address end) {
-#if !defined(_WINDOWS) && (!defined(IA64) || defined(AIX))
+#if !defined(_WINDOWS) && !defined(IA64) && !defined(PPC64)
   assert(pointer_delta(end, start, sizeof(jbyte)) < INT_MAX,
          "Code size exceeds maximum range");
 
   collector_func_load((char*)name, NULL, NULL, start,
     pointer_delta(end, start, sizeof(jbyte)), 0, NULL);
-#endif // !_WINDOWS && !IA64
+#endif // !_WINDOWS && !IA64 && !PPC64
 }
--- a/src/share/vm/runtime/os.cpp	Mon Feb 10 10:34:59 2014 +0100
+++ b/src/share/vm/runtime/os.cpp	Mon Feb 10 10:47:51 2014 +0100
@@ -996,7 +996,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(AIX)
+#if (defined(IA64) && !defined(AIX))
   // In order to walk native frames on Itanium, we need to access the unwind
   // table, which is inside ELF. We don't want to parse ELF after fatal error,
   // so return true for IA64. If we need to support C stack walking on IA64,