# HG changeset patch
# User iignatyev
# Date 1444901773 0
# Node ID 39347c44159e74a471fc24ad3372c82a4b87178d
# Parent  db796ab93ba7dc0cd18f6250fa512e3ec8ff4365# Parent  50fdbbef9e761eea9cdc7f8c2e7395e8a6ae0d09
Merge

diff -r db796ab93ba7 -r 39347c44159e hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Oct 15 02:46:51 2015 +0300
+++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Oct 15 09:36:13 2015 +0000
@@ -1001,7 +1001,7 @@
     __ delayed()->nop();
 
     __ ld_ptr(G2_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset()), G3);
-    __ st(G0, Address(G2_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    __ st_ptr(G0, Address(G2_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
 
     __ bind(no_alternative_target);
   }