commit 86ab23972978242b6f9e27cebc239f3e8428b1af
author Martin Storsjo <martin@martin.st> Fri Jan 26 06:50:07 2018 +0000
committer Martin Storsjo <martin@martin.st> Fri Jan 26 06:50:07 2018 +0000
tree b08abd3cb1e39a2ec3b05da447bbebc889eaacc7
parent f237718040ab3018e3ab6e18e930cc0a23bf56ec

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

git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@323499 91177308-0d34-0410-b5e6-96231b3b80d8

src/config.h

diff --git a/src/config.h b/src/config.h
index 0b300db..1a7a306 100644
--- a/src/config.h
+++ b/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