From 25a37a894e17d3c05b5bff75e3fa91fb61dc0c6f Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 26 Jan 2018 06:50:07 +0000 Subject: 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 llvm-svn: 323499 --- libunwind/src/config.h | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3