gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4099 from JunHe77/aarch64_stack_cflag

Browse Source 
Fixed stack trace generation on aarch64
This commit is contained in:
Salvatore Sanfilippo 2018-05-24 16:16:12 +02:00 committed by GitHub
commit 9af67047c5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -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

2
src/debug.c
View File

@ -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;