--- a/src/gpu/hsail/vm/gpu_hsail.cpp	Tue Jan 13 12:59:48 2015 +0100
+++ b/src/gpu/hsail/vm/gpu_hsail.cpp	Tue Jan 13 13:04:37 2015 +0100
@@ -147,7 +147,7 @@
   // We avoid HSAILAllocationInfo logic if kernel does not allocate
   // in which case the num_tlabs passed in will be 0
   HSAILAllocationInfo* allocInfo = (num_tlabs == 0 ?  NULL : new HSAILAllocationInfo(num_tlabs, dimX, allocBytesPerWorkitem));
-  
+
   // Reset the kernel arguments
   _okra_clear_args(kernel);
 
@@ -260,11 +260,11 @@
                 if (oopMapHelper.is_oop(pc_offset, bit)) {
                   if (bit < hsailFrame->num_d_regs()) {
                     // show $d reg oop
-                    tty->print_cr("  oop $d%d = " INTPTR_FORMAT, bit, hsailFrame->get_oop_for_bit(bit));
+                    tty->print_cr("  oop $d%d = " PTR64_FORMAT, bit, hsailFrame->get_oop_for_bit(bit));
                   } else {
                     // show stack slot oop
                     int stackOffset = (bit - hsailFrame->num_d_regs()) * 8;  // 8 bytes per stack slot
-                    tty->print_cr("  oop stk:%d = " INTPTR_FORMAT, stackOffset, hsailFrame->get_oop_for_bit(bit));
+                    tty->print_cr("  oop stk:%d = " PTR64_FORMAT, stackOffset, hsailFrame->get_oop_for_bit(bit));
                   }
                 }
               }
@@ -281,7 +281,7 @@
     }
     // when we are done with the deopts, we don't need to oops_do anything
     // in the saved state anymore
-    thread->set_gpu_hsail_deopt_info(NULL);  
+    thread->set_gpu_hsail_deopt_info(NULL);
 
     // Handle any never_ran workitems if there were any
     {
@@ -345,7 +345,7 @@
   env->GetByteArrayRegion(code_handle, 0, code_len, (jbyte*) code);
   env->GetStringUTFRegion(name_handle, 0, name_len, name);
 
-  // The kernel entrypoint is always run for the time being  
+  // The kernel entrypoint is always run for the time being
   const char* entryPointName = "&run";
   jlong okra_kernel;
   {
@@ -400,7 +400,7 @@
   // If Okra library is not already loaded, load it here
   if (okra_lib_handle == NULL) {
     okra_lib_handle = os::dll_load(okra_library_name, ebuf, O_BUFLEN);
-  }  
+  }
   if (okra_lib_handle == NULL) {
     // Unable to open Okra library
     if (TraceGPUInteraction) {
@@ -408,7 +408,7 @@
     }
     return false;
   }
-  
+
   guarantee(_okra_get_context == NULL, "cannot repeat GPU initialization");
 
   // At this point we know  okra_lib_handle is valid whether we loaded