--- a/hotspot/src/share/vm/opto/generateOptoStub.cpp	Wed Jul 10 09:14:25 2013 -0700
+++ b/hotspot/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);