Merge pull request redis#4099 from JunHe77/aarch64_stack_cflag

Fixed stack trace generation on aarch64
JackieXie168 · May 24, 2018 · 8a62419 · 8a62419
2 parents d9aab3f + 331aa6f
commit 8a62419
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Makefile b/src/Makefile
@@ -39,7 +39,7 @@ endif
 endif
 
 # 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
 endif
 

diff --git a/src/debug.c b/src/debug.c
@@ -688,6 +688,8 @@ static void *getMcontextEip(ucontext_t *uc) {
     return (void*) uc->uc_mcontext.sc_ip;
     #elif defined(__arm__) /* Linux ARM */
     return (void*) uc->uc_mcontext.arm_pc;
+    #elif defined(__aarch64__) /* Linux AArch64 */
+    return (void*) uc->uc_mcontext.pc;
     #endif
 #else
     return NULL;