diff options
| author | Martin Storsjo <martin@martin.st> | 2018-01-26 06:50:07 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-01-26 06:50:07 +0000 |
| commit | d140b7e45e056c46a9f46ace53070b11b18b2a74 (patch) | |
| tree | 98e6b5f4439a242791021cfb8611ad37d83e8961 /libunwind | |
| parent | 6fdbec3f069293875a2d8321a1e6ad8106d4e3f6 (diff) | |
Don't enable _LIBUNWIND_BUILD_ZERO_COST_APIS if building the SJLJ APIs
Otherwise, a shared library build with SJLJ APIs enabled would
end up with duplicate symbols.
This didn't occur for the apple && arm case due to specifically
checking for that in the surrounding ifdef.
Differential Revision: https://reviews.llvm.org/D42555
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/src/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libunwind/src/config.h b/libunwind/src/config.h index 0b300db73d0..1a7a30665dd 100644 --- a/libunwind/src/config.h +++ b/libunwind/src/config.h @@ -72,8 +72,10 @@ (!defined(__APPLE__) && defined(__arm__)) || \ (defined(__arm64__) || defined(__aarch64__)) || \ defined(__mips__) +#if !defined(_LIBUNWIND_BUILD_SJLJ_APIS) #define _LIBUNWIND_BUILD_ZERO_COST_APIS #endif +#endif #if defined(__powerpc64__) && defined(_ARCH_PWR8) #define PPC64_HAS_VMX |