archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8019973: PPC64 (part 11): Fix IA64 preprocessor conditionals on AIX

Browse source 
On AIX 7.1 systemcfg.h defines IA64 unconditionally, so test for !AIX where IA64 is used.

Reviewed-by: dholmes, kvn
This commit is contained in:
Goetz Lindenmaier 2013-07-05 22:17:47 +02:00
parent 49c4939936
commit b57506ea6c
7 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/opto/generateOptoStub.cpp
View file

@ -214,7 +214,7 @@ void GraphKit::gen_stub(address C_function,
#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);