# HG changeset patch
# User mikael
# Date 1449273005 0
# Node ID b18ade6f6c4197d854bd1de3f224be8f287e0adb
# Parent  bdc3835a6e597609ea79cfe7e1c2b723c9af8027# Parent  2a2f26afac413f7bf7471113a9f600e8c752539e
Merge

diff -r bdc3835a6e59 -r b18ade6f6c41 hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp	Fri Dec 04 16:23:39 2015 +0100
+++ b/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp	Fri Dec 04 23:50:05 2015 +0000
@@ -73,7 +73,7 @@
     NativeMovConstReg32* move = nativeMovConstReg32_at(pc);
     narrowKlass narrowOop = record_narrow_metadata_reference(constant, CHECK);
     move->set_data((intptr_t)narrowOop);
-    TRACE_jvmci_3("relocating (narrow metaspace constant) at %p/%p", pc, narrowOop);
+    TRACE_jvmci_3("relocating (narrow metaspace constant) at " PTR_FORMAT "/0x%x", p2i(pc), narrowOop);
 #else
     JVMCI_ERROR("compressed Klass* on 32bit");
 #endif
@@ -81,7 +81,7 @@
     NativeMovConstReg* move = nativeMovConstReg_at(pc);
     Metadata* reference = record_metadata_reference(constant, CHECK);
     move->set_data((intptr_t)reference);
-    TRACE_jvmci_3("relocating (metaspace constant) at %p/%p", pc, reference);
+    TRACE_jvmci_3("relocating (metaspace constant) at " PTR_FORMAT "/" PTR_FORMAT, p2i(pc), p2i(reference));
   }
 }