Mercurial > hg > truffle
diff src/share/vm/opto/generateOptoStub.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 | 9fae07c31641 |
children | cfd05ec74089 |
line wrap: on
line diff
--- a/src/share/vm/opto/generateOptoStub.cpp Wed Jul 10 09:14:25 2013 -0700 +++ b/src/share/vm/opto/generateOptoStub.cpp Fri Jul 05 22:17:47 2013 +0200 @@ -214,7 +214,7 @@ #if defined(SPARC) store_to_memory(NULL, adr_flags, intcon(0), T_INT, NoAlias); #endif /* defined(SPARC) */ -#ifdef IA64 +#if (defined(IA64) && !defined(AIX)) Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset())); if( os::is_MP() ) insert_mem_bar(Op_MemBarRelease); store_to_memory(NULL, adr_last_Java_fp, null(), T_ADDRESS, NoAlias);