# HG changeset patch
# User dholmes
# Date 1482195939 0
# Node ID 5f53b4bc0c673ab25cfb4f6763f0d958b9d5696d
# Parent  ccdff44937875d749d8619600bb8e36ca7ef7c2b# Parent  f71e11a0567dd11bc842d384a7e93c6eefa6a7c4
Merge

diff -r ccdff4493787 -r 5f53b4bc0c67 hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp	Mon Dec 19 22:50:28 2016 +0000
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp	Tue Dec 20 01:05:39 2016 +0000
@@ -606,8 +606,10 @@
   st->print("  TRAPNO=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_TRAPNO]);
   st->cr();
 #else
-  for (int r = 0; r < 31; r++)
-    st->print_cr(  "R%d=" INTPTR_FORMAT, r, (size_t)uc->uc_mcontext.regs[r]);
+  for (int r = 0; r < 31; r++) {
+    st->print("R%-2d=", r);
+    print_location(st, uc->uc_mcontext.regs[r]);
+  }
 #endif
   st->cr();