diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-03-01 02:23:54 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-03-01 02:23:54 +0000 |
| commit | 9e2169efef5bd447dac9620c9c76fe4020e9b7e8 (patch) | |
| tree | cf7a0ef8290b66c483bade8b0839740392371427 /src/cxa_personality.cpp | |
| parent | 3f19f77facd5f93d9fb97201a8f93fbd450f0c43 (diff) | |
Fix non-reserved macro names LIBCXXABI_NORETURN and LIBCXXABI_ARM_EHABI.
This patch adds the required leading underscore to those macros.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@296567 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src/cxa_personality.cpp')
| -rw-r--r-- | src/cxa_personality.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cxa_personality.cpp b/src/cxa_personality.cpp index 75f6b4a..ee69fde 100644 --- a/src/cxa_personality.cpp +++ b/src/cxa_personality.cpp @@ -317,7 +317,7 @@ call_terminate(bool native_exception, _Unwind_Exception* unwind_exception) std::terminate(); } -#if LIBCXXABI_ARM_EHABI +#if _LIBCXXABI_ARM_EHABI static const void* read_target2_value(const void* ptr) { uintptr_t offset = *reinterpret_cast<const uintptr_t*>(ptr); @@ -358,7 +358,7 @@ get_shim_type_info(uint64_t ttypeIndex, const uint8_t* classInfo, return reinterpret_cast<const __shim_type_info *>( read_target2_value(ttypePtr)); } -#else // !LIBCXXABI_ARM_EHABI +#else // !_LIBCXXABI_ARM_EHABI static const __shim_type_info* get_shim_type_info(uint64_t ttypeIndex, const uint8_t* classInfo, @@ -394,7 +394,7 @@ get_shim_type_info(uint64_t ttypeIndex, const uint8_t* classInfo, classInfo -= ttypeIndex; return (const __shim_type_info*)readEncodedPointer(&classInfo, ttypeEncoding); } -#endif // !LIBCXXABI_ARM_EHABI +#endif // !_LIBCXXABI_ARM_EHABI /* This is checking a thrown exception type, excpType, against a possibly empty @@ -405,7 +405,7 @@ get_shim_type_info(uint64_t ttypeIndex, const uint8_t* classInfo, the list will catch a excpType. If any catchType in the list can catch an excpType, then this exception spec does not catch the excpType. */ -#if LIBCXXABI_ARM_EHABI +#if _LIBCXXABI_ARM_EHABI static bool exception_spec_can_catch(int64_t specIndex, const uint8_t* classInfo, @@ -934,7 +934,7 @@ _UA_CLEANUP_PHASE Else a cleanup is not found: return _URC_CONTINUE_UNWIND */ -#if !LIBCXXABI_ARM_EHABI +#if !_LIBCXXABI_ARM_EHABI _LIBCXXABI_FUNC_VIS _Unwind_Reason_Code #ifdef __USING_SJLJ_EXCEPTIONS__ __gxx_personality_sj0 @@ -1194,7 +1194,7 @@ __cxa_call_unexpected(void* arg) u_handler = old_exception_header->unexpectedHandler; // If std::__unexpected(u_handler) rethrows the same exception, // these values get overwritten by the rethrow. So save them now: -#if LIBCXXABI_ARM_EHABI +#if _LIBCXXABI_ARM_EHABI ttypeIndex = (int64_t)(int32_t)unwind_exception->barrier_cache.bitpattern[4]; lsda = (const uint8_t*)unwind_exception->barrier_cache.bitpattern[2]; #else |