--- old/src/cpu/x86/vm/macroAssembler_x86.cpp	2017-06-28 15:43:01.000000000 -0700
+++ new/src/cpu/x86/vm/macroAssembler_x86.cpp	2017-06-28 15:43:01.000000000 -0700
@@ -894,7 +894,7 @@
 void MacroAssembler::print_state64(int64_t pc, int64_t regs[]) {
   ttyLocker ttyl;
   FlagSetting fs(Debugging, true);
-  tty->print_cr("rip = 0x%016lx", pc);
+  tty->print_cr("rip = 0x%016lx", (intptr_t)pc);
 #ifndef PRODUCT
   tty->cr();
   findpc(pc);
@@ -923,13 +923,13 @@
   int64_t* rsp = (int64_t*) regs[11];
   int64_t* dump_sp = rsp;
   for (int col1 = 0; col1 < 8; col1++) {
-    tty->print("(rsp+0x%03x) 0x%016lx: ", (int)((intptr_t)dump_sp - (intptr_t)rsp), (int64_t)dump_sp);
+    tty->print("(rsp+0x%03x) 0x%016lx: ", (int)((intptr_t)dump_sp - (intptr_t)rsp), (intptr_t)dump_sp);
     os::print_location(tty, *dump_sp++);
   }
   for (int row = 0; row < 25; row++) {
-    tty->print("(rsp+0x%03x) 0x%016lx: ", (int)((intptr_t)dump_sp - (intptr_t)rsp), (int64_t)dump_sp);
+    tty->print("(rsp+0x%03x) 0x%016lx: ", (int)((intptr_t)dump_sp - (intptr_t)rsp), (intptr_t)dump_sp);
     for (int col = 0; col < 4; col++) {
-      tty->print(" 0x%016lx", *dump_sp++);
+      tty->print(" 0x%016lx", (intptr_t)*dump_sp++);
     }
     tty->cr();
   }