# HG changeset patch
# User roland
# Date 1444895813 0
# Node ID ea9cb42aa6eb71dc9868e58cee89b2707ec970cd
# Parent  34e5004f5acb68112ae505d27afaa2f6535b01ef# Parent  50fdbbef9e761eea9cdc7f8c2e7395e8a6ae0d09
Merge

diff -r 34e5004f5acb -r ea9cb42aa6eb hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Oct 15 09:40:45 2015 +0200
+++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Oct 15 07:56:53 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);
   }