changeset 43445:5d868b60af95

Merge
author rprotacio
date Thu, 12 Jan 2017 19:34:29 +0000
parents e7abeb81e94a f444a6847614
children 4f9ac7ab99d9 c1a7412d597d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp	Thu Jan 12 14:04:08 2017 -0500
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp	Thu Jan 12 19:34:29 2017 +0000
@@ -209,7 +209,7 @@
       // belong to the caller.
       intptr_t* fp = os::Linux::ucontext_get_fp(uc);
       intptr_t* sp = os::Linux::ucontext_get_sp(uc);
-      void* pc = (void*)(uc->uc_mcontext.regs[REG_LR]
+      address pc = (address)(uc->uc_mcontext.regs[REG_LR]
                          - NativeInstruction::instruction_size);
       *fr = frame(sp, fp, pc);
       if (!fr->is_java_frame()) {