From 351ac8b1cc791aa0fb751615040dcbc9a6f65bb8 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 4 Apr 2019 17:50:14 +0000 Subject: [PATCH] Move the alias definition of unw_getcontext to within !defined(__USING_SJLJ_EXCEPTIONS__) For builds with SJLJ, there is no __unw_getcontext symbol. On Windows, the weak alias macro also expands to a dllexport directive, which fails if the symbol doesn't exist. Differential Revision: https://reviews.llvm.org/D60251 llvm-svn: 357711 --- libunwind/src/UnwindRegistersSave.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libunwind/src/UnwindRegistersSave.S b/libunwind/src/UnwindRegistersSave.S index 7db023c69c3e..c2983e7332b5 100644 --- a/libunwind/src/UnwindRegistersSave.S +++ b/libunwind/src/UnwindRegistersSave.S @@ -972,8 +972,9 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) jmp %o7 clr %o0 // return UNW_ESUCCESS #endif -#endif /* !defined(__USING_SJLJ_EXCEPTIONS__) */ WEAK_ALIAS(__unw_getcontext, unw_getcontext) +#endif /* !defined(__USING_SJLJ_EXCEPTIONS__) */ + NO_EXEC_STACK_DIRECTIVE