Unverified Commit b23a5011 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #4099 from JunHe77/aarch64_stack_cflag

Fixed stack trace generation on aarch64
parents 18b7f711 c8ca71d4
...@@ -39,7 +39,7 @@ endif ...@@ -39,7 +39,7 @@ endif
endif endif
# To get ARM stack traces if Redis crashes we need a special C flag. # To get ARM stack traces if Redis crashes we need a special C flag.
ifneq (,$(findstring armv,$(uname_M))) ifneq (,$(filter aarch64 armv,$(uname_M)))
CFLAGS+=-funwind-tables CFLAGS+=-funwind-tables
endif endif
......
...@@ -688,6 +688,8 @@ static void *getMcontextEip(ucontext_t *uc) { ...@@ -688,6 +688,8 @@ static void *getMcontextEip(ucontext_t *uc) {
return (void*) uc->uc_mcontext.sc_ip; return (void*) uc->uc_mcontext.sc_ip;
#elif defined(__arm__) /* Linux ARM */ #elif defined(__arm__) /* Linux ARM */
return (void*) uc->uc_mcontext.arm_pc; return (void*) uc->uc_mcontext.arm_pc;
#elif defined(__aarch64__) /* Linux AArch64 */
return (void*) uc->uc_mcontext.pc;
#endif #endif
#else #else
return NULL; return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment