[PATCH] D42555: [libunwind] Don't enable _LIBUNWIND_BUILD_ZERO_COST_APIS if building the SJLJ APIs

[Martin Storsjö via Phabricator via cfe-commits]

mstorsjo created this revision.
mstorsjo added reviewers: compnerd, smeenai, phosek.
Herald added subscribers: kristof.beyls, aemerson.

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.


https://reviews.llvm.org/D42555

Files:
  src/config.h


Index: src/config.h
===================================================================
--- src/config.h
+++ 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



Index: src/config.h
===================================================================
--- src/config.h
+++ 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

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits