summaryrefslogtreecommitdiffstats
path: root/libunwind
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2016-04-20 20:54:51 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2016-04-20 20:54:51 +0000
commit87bd085e88c82f445476dbe4e052a6f5cbe3543b (patch)
tree1113a6d311ffa159273721fb179e69f4d1248213 /libunwind
parent6011811beb50d8df9216b9932ab375f7576860de (diff)
downloadbcm5719-llvm-87bd085e88c82f445476dbe4e052a6f5cbe3543b.tar.gz
bcm5719-llvm-87bd085e88c82f445476dbe4e052a6f5cbe3543b.zip
unwind: remove an instance of -Wexpansion-to-defined
This follows the pattern in the Apple clause duplicating a tuple of definitions. However, it will define them to a value rather than a defined check to remove the `-Wexpansion-to-defined` warning (which may be treated as an error). This also opens the door to unifying the two code paths into one. NFC. llvm-svn: 266915
Diffstat (limited to 'libunwind')
-rw-r--r--libunwind/src/config.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/libunwind/src/config.h b/libunwind/src/config.h
index 6ef8c7f63fa..b14e591ba42 100644
--- a/libunwind/src/config.h
+++ b/libunwind/src/config.h
@@ -75,10 +75,15 @@
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
#define _LIBUNWIND_ABORT(msg) assert_rtn(__func__, __FILE__, __LINE__, msg)
- #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 0
- #define _LIBUNWIND_SUPPORT_DWARF_UNWIND !defined(__arm__) || \
- defined(__ARM_DWARF_EH__)
- #define _LIBUNWIND_SUPPORT_DWARF_INDEX _LIBUNWIND_SUPPORT_DWARF_UNWIND
+ #if defined(__ARM_DWARF_EH__) || !defined(__arm__)
+ #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 0
+ #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1
+ #define _LIBUNWIND_SUPPORT_DWARF_INDEX 1
+ #else
+ #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 0
+ #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 0
+ #define _LIBUNWIND_SUPPORT_DWARF_INDEX 0
+ #endif
#endif
#define _LIBUNWIND_BUILD_ZERO_COST_APIS \
OpenPOWER on IntegriCloud