Skip to content

Commit

Permalink
Apple Mac M1 build fix. (#392)
Browse files Browse the repository at this point in the history
backward-cpp dependency fix for ARM 64 backport, wrong access to PC register.
  • Loading branch information
devnexen authored Jan 23, 2021
1 parent 6dc10a3 commit 1f8368a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion 3rdparty/backward-cpp/backward.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3928,7 +3928,11 @@ class SignalHandling {
#elif defined(__arm__)
error_addr = reinterpret_cast<void *>(uctx->uc_mcontext.arm_pc);
#elif defined(__aarch64__)
error_addr = reinterpret_cast<void *>(uctx->uc_mcontext.pc);
#if defined(__APPLE__)
error_addr = reinterpret_cast<void *>(uctx->uc_mcontext->__ss.__pc);
#else
error_addr = reinterpret_cast<void *>(uctx->uc_mcontext.pc);
#endif
#elif defined(__mips__)
error_addr = reinterpret_cast<void *>(reinterpret_cast<struct sigcontext*>(&uctx->uc_mcontext)->sc_pc);
#elif defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || \
Expand Down

0 comments on commit 1f8368a

Please sign in to comment.