From 62f3726365375131f5116b72ae3a279bfcec8352 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 20 Apr 2016 20:53:40 +0000 Subject: [PATCH] unwind: unify _LIBUNWIND_SUPPORT_DWARF_UNWIND Join the two paths for this macro. At the end of the day, the difference was that MIPS and ARM on Apple have different behaviour. This is a setup change to remove an instance of -Wexpansion-to-defined. NFC. llvm-svn: 266913 --- libunwind/src/config.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libunwind/src/config.h b/libunwind/src/config.h index ecc0a6b..6ef8c7f 100644 --- a/libunwind/src/config.h +++ b/libunwind/src/config.h @@ -39,10 +39,6 @@ } #endif - #define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \ - defined(__x86_64__) || \ - defined(__arm64__) || \ - defined(__mips__)) #define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__) #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \ defined(__x86_64__)) @@ -71,10 +67,6 @@ abort(); } - #define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \ - defined(__x86_64__) || \ - defined(__arm__) || \ - defined(__aarch64__)) #define _LIBUNWIND_BUILD_SJLJ_APIS 0 #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \ defined(__x86_64__)) @@ -89,6 +81,11 @@ #define _LIBUNWIND_SUPPORT_DWARF_INDEX _LIBUNWIND_SUPPORT_DWARF_UNWIND #endif +#define _LIBUNWIND_BUILD_ZERO_COST_APIS \ + (defined(__i386__) || defined(__x86_64__) || \ + (!defined(__APPLE__) && defined(__arm__)) || \ + (defined(__arm64__) || defined(__aarch64__)) || \ + (defined(__APPLE__) && defined(__mips__))) // Macros that define away in non-Debug builds #ifdef NDEBUG -- 2.7.4