From 8edf3a5e0cdc47a3229afd09016dd7c377bcf691 Mon Sep 17 00:00:00 2001 From: Jason King Date: Sun, 5 Apr 2020 04:30:55 +0000 Subject: Fix signal stacks on illumos/Solaris --- include/tdep-x86_64/libunwind_i.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/tdep-x86_64/libunwind_i.h b/include/tdep-x86_64/libunwind_i.h index 8713b39d..6b798c71 100644 --- a/include/tdep-x86_64/libunwind_i.h +++ b/include/tdep-x86_64/libunwind_i.h @@ -89,6 +89,7 @@ struct cursor X86_64_SCF_LINUX_RT_SIGFRAME, /* Linux ucontext_t */ X86_64_SCF_FREEBSD_SIGFRAME, /* FreeBSD signal frame */ X86_64_SCF_FREEBSD_SYSCALL, /* FreeBSD syscall */ + X86_64_SCF_SOLARIS_SIGFRAME, /* illumos/Solaris signal frame */ } sigcontext_format; unw_word_t sigcontext_addr; @@ -200,7 +201,7 @@ dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val) #define tdep_get_exe_image_path UNW_ARCH_OBJ(get_exe_image_path) #define tdep_access_reg UNW_OBJ(access_reg) #define tdep_access_fpreg UNW_OBJ(access_fpreg) -#if __linux__ || __sun +#if __linux__ # define tdep_fetch_frame UNW_OBJ(fetch_frame) # define tdep_cache_frame UNW_OBJ(cache_frame) # define tdep_reuse_frame UNW_OBJ(reuse_frame) @@ -252,7 +253,7 @@ extern int tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp, int write); extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp, int write); -#if __linux__ || __sun +#if __linux__ extern void tdep_fetch_frame (struct dwarf_cursor *c, unw_word_t ip, int need_unwind_info); extern int tdep_cache_frame (struct dwarf_cursor *c); -- cgit v1.2.1