Mercurial > hg > truffle

diff src/share/vm/utilities/macros.hpp @ 14403:75ef1a499665

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 Fri, 05 Jul 2013 22:17:47 +0200
parents b5c8a61d7fa0
children bdd155477289
line wrap: on
line diff
--- a/src/share/vm/utilities/macros.hpp	Wed Jul 10 09:14:25 2013 -0700
+++ b/src/share/vm/utilities/macros.hpp	Fri Jul 05 22:17:47 2013 +0200
@@ -320,7 +320,11 @@
 #define NOT_IA32(code) code
 #endif
 
-#ifdef IA64
+// This is a REALLY BIG HACK, but on AIX <sys/systemcfg.h> unconditionally defines IA64.
+// At least on AIX 7.1 this is a real problem because 'systemcfg.h' is indirectly included
+// by 'pthread.h' and other common system headers.
+
+#if defined(IA64) && !defined(AIX)
 #define IA64_ONLY(code) code
 #define NOT_IA64(code)
 #else