diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-04-26 01:11:29 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-04-26 01:11:29 +0000 |
| commit | 9a6a8eaf070d5a55ab8bc5d0a91ed0070bf1cc0c (patch) | |
| tree | a306b325f4531c2e44450bfbd80be49a6e079f4e | |
| parent | 9a1699c0c6ef98c9d2f30fd52dda7a8e4990fbc8 (diff) | |
| download | bcm5719-llvm-9a6a8eaf070d5a55ab8bc5d0a91ed0070bf1cc0c.tar.gz bcm5719-llvm-9a6a8eaf070d5a55ab8bc5d0a91ed0070bf1cc0c.zip | |
unwind: remove last instance of -Wexpansion-to-defined
This unifies the definition of _LIBUNWIND_BUILD_SJLJ_APIS. It also further
generalises the definition to allow building these APIs on non-Apple targets
when `-fsjlj-excceptions` is used. The header is now clean of macros which
expand to defined checks.
llvm-svn: 267509
| -rw-r--r-- | libunwind/src/config.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libunwind/src/config.h b/libunwind/src/config.h index f31769cecf6..46bb08a9dab 100644 --- a/libunwind/src/config.h +++ b/libunwind/src/config.h @@ -30,8 +30,6 @@ // Platform specific configuration defines. #ifdef __APPLE__ - #define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__) - #if defined(FOR_DYLD) #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 0 @@ -42,8 +40,6 @@ #define _LIBUNWIND_SUPPORT_DWARF_INDEX 0 #endif #else - #define _LIBUNWIND_BUILD_SJLJ_APIS 0 - #if defined(__ARM_DWARF_EH__) || !defined(__arm__) #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 0 #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 @@ -59,6 +55,12 @@ #define _LIBUNWIND_EXPORT __attribute__((visibility("default"))) #define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden"))) +#if (defined(__APPLE__) && defined(__arm__)) || defined(__USING_SJLJ_EXCEPTIONS__) +#define _LIBUNWIND_BUILD_SJLJ_APIS 1 +#else +#define _LIBUNWIND_BUILD_SJLJ_APIS 0 +#endif + #if defined(__i386__) || defined(__x86_64__) #define _LIBUNWIND_SUPPORT_FRAME_APIS 1 #else |
