diff options
| author | Martin Storsjo <martin@martin.st> | 2019-04-04 17:50:14 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-04-04 17:50:14 +0000 |
| commit | 351ac8b1cc791aa0fb751615040dcbc9a6f65bb8 (patch) | |
| tree | 182434b70d55f991bba701251c20861b4d7a3c98 /libunwind/src | |
| parent | 2a7cac932bbca5492e5a42d9dac33e0cb76d0f83 (diff) | |
| download | bcm5719-llvm-351ac8b1cc791aa0fb751615040dcbc9a6f65bb8.tar.gz bcm5719-llvm-351ac8b1cc791aa0fb751615040dcbc9a6f65bb8.zip | |
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
Diffstat (limited to 'libunwind/src')
| -rw-r--r-- | libunwind/src/UnwindRegistersSave.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libunwind/src/UnwindRegistersSave.S b/libunwind/src/UnwindRegistersSave.S index 7db023c69c3..c2983e7332b 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 |
