Merged: Fix build on PPC arch with musl

Jaideep Bajwa · Commit Bot · commit eeb87aa421c1 · 2017-09-15T10:51:31.000Z
Revision: d288a87 NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true BUG=v8:6793 R=machenbach@chromium.org, robertoguimaraes8@gmail.com, ulan@chromium.org Bug: Change-Id: I3de61afb5dbd24269067103cec2d5697eedf16d5 Reviewed-on: https://chromium-review.googlesource.com/636484 Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Jaideep Bajwa <bjaideep@ca.ibm.com> Cr-Commit-Position: refs/branch-heads/6.1@{#78} Cr-Branched-From: 1bf2e10-refs/heads/6.1.534@{#1} Cr-Branched-From: e825c43-refs/heads/master@{#46746}
diff --git a/src/libsampler/sampler.cc b/src/libsampler/sampler.cc
@@ -450,11 +450,18 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
   state->sp = reinterpret_cast<void*>(mcontext.gregs[29]);
   state->fp = reinterpret_cast<void*>(mcontext.gregs[30]);
 #elif V8_HOST_ARCH_PPC
+#if V8_LIBC_GLIBC
   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->nip);
   state->sp =
       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R1]);
   state->fp =
       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+#else
+  // Some C libraries, notably Musl, define the regs member as a void pointer
+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
+#endif
 #elif V8_HOST_ARCH_S390
 #if V8_TARGET_ARCH_32_BIT
   // 31-bit target will have bit 0 (MSB) of the PSW set to denote addressing
