unwind: unify some more macros

The macros were defined identically across both cases.  Unify the definitions to
have a single definition for _LIBUWNIND_{HIDDEN,EXPORT} and _LIBUNWIND_LOG.
NFC.

llvm-svn: 267169
This commit is contained in:
Saleem Abdulrasool 2016-04-22 17:11:05 +00:00
parent a630380a0c
commit 39d86f44cb
1 changed files with 6 additions and 7 deletions

View File

@ -40,9 +40,6 @@
#endif #endif
#define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__) #define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__)
#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
#define _LIBUNWIND_ABORT(msg) __assert_rtn(__func__, __FILE__, __LINE__, msg) #define _LIBUNWIND_ABORT(msg) __assert_rtn(__func__, __FILE__, __LINE__, msg)
#if defined(FOR_DYLD) #if defined(FOR_DYLD)
@ -54,7 +51,6 @@
#define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1
#define _LIBUNWIND_SUPPORT_DWARF_INDEX 0 #define _LIBUNWIND_SUPPORT_DWARF_INDEX 0
#endif #endif
#else #else
#include <stdlib.h> #include <stdlib.h>
@ -66,9 +62,6 @@
} }
#define _LIBUNWIND_BUILD_SJLJ_APIS 0 #define _LIBUNWIND_BUILD_SJLJ_APIS 0
#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
#define _LIBUNWIND_ABORT(msg) assert_rtn(__func__, __FILE__, __LINE__, msg) #define _LIBUNWIND_ABORT(msg) assert_rtn(__func__, __FILE__, __LINE__, msg)
#if defined(__ARM_DWARF_EH__) || !defined(__arm__) #if defined(__ARM_DWARF_EH__) || !defined(__arm__)
@ -82,6 +75,10 @@
#endif #endif
#endif #endif
// FIXME: these macros are not correct for COFF targets
#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))
#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define _LIBUNWIND_SUPPORT_FRAME_APIS 1 #define _LIBUNWIND_SUPPORT_FRAME_APIS 1
#else #else
@ -97,6 +94,8 @@
#define _LIBUNWIND_BUILD_ZERO_COST_APIS 0 #define _LIBUNWIND_BUILD_ZERO_COST_APIS 0
#endif #endif
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)
// Macros that define away in non-Debug builds // Macros that define away in non-Debug builds
#ifdef NDEBUG #ifdef NDEBUG
#define _LIBUNWIND_DEBUG_LOG(msg, ...) #define _LIBUNWIND_DEBUG_LOG(msg, ...)