diff options
| author |   robert <robert@openbsd.org> | 2018-09-11 17:41:23 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2018-09-11 17:41:23 +0000 |
| commit | db4e89edfc7ef1d2b80b1c09093dd987640ce7d0 (patch) | |
| tree | 880ff56e73f3b26e842444df7f3ab5fafd1783bf /lib/libunwind/src/Unwind_AppleExtras.cpp | |
| parent | The cursor position is limited to the margins for CUF and CUB, so turn (diff) | |
| download | wireguard-openbsd-db4e89edfc7ef1d2b80b1c09093dd987640ce7d0.tar.xz wireguard-openbsd-db4e89edfc7ef1d2b80b1c09093dd987640ce7d0.zip | |
import of libunwind 6.0.0
Diffstat (limited to 'lib/libunwind/src/Unwind_AppleExtras.cpp')
| -rw-r--r-- | lib/libunwind/src/Unwind_AppleExtras.cpp | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/lib/libunwind/src/Unwind_AppleExtras.cpp b/lib/libunwind/src/Unwind_AppleExtras.cpp index b8baef5fa76..39f379c5298 100644 --- a/lib/libunwind/src/Unwind_AppleExtras.cpp +++ b/lib/libunwind/src/Unwind_AppleExtras.cpp @@ -9,8 +9,8 @@ //===----------------------------------------------------------------------===// #include "config.h" +#include "AddressSpace.hpp" #include "DwarfParser.hpp" -#include "unwind_ext.h" // private keymgr stuff @@ -76,7 +76,7 @@ struct libgcc_object_info { #endif -#if _LIBUNWIND_BUILD_ZERO_COST_APIS +#if defined(_LIBUNWIND_BUILD_ZERO_COST_APIS) // // symbols in libSystem.dylib in 10.6 and later, but are in libgcc_s.dylib in @@ -115,12 +115,12 @@ NEVER_HERE(__register_frame_table) NEVER_HERE(__deregister_frame_info) NEVER_HERE(__deregister_frame_info_bases) -#endif // _LIBUNWIND_BUILD_ZERO_COST_APIS +#endif // defined(_LIBUNWIND_BUILD_ZERO_COST_APIS) -#if _LIBUNWIND_BUILD_SJLJ_APIS +#if defined(_LIBUNWIND_BUILD_SJLJ_APIS) // // symbols in libSystem.dylib in iOS 5.0 and later, but are in libgcc_s.dylib in // earlier versions @@ -140,7 +140,7 @@ NOT_HERE_BEFORE_5_0(_Unwind_SjLj_RaiseException) NOT_HERE_BEFORE_5_0(_Unwind_SjLj_Resume_or_Rethrow) NOT_HERE_BEFORE_5_0(_Unwind_SjLj_Unregister) -#endif // _LIBUNWIND_BUILD_SJLJ_APIS +#endif // defined(_LIBUNWIND_BUILD_SJLJ_APIS) namespace libunwind { @@ -182,24 +182,3 @@ bool checkKeyMgrRegisteredFDEs(uintptr_t pc, void *&fde) { } - -#if !defined(FOR_DYLD) && _LIBUNWIND_BUILD_SJLJ_APIS - -#include <System/pthread_machdep.h> - -// Accessors to get get/set linked list of frames for sjlj based execeptions. -_LIBUNWIND_HIDDEN -struct _Unwind_FunctionContext *__Unwind_SjLj_GetTopOfFunctionStack() { - return (struct _Unwind_FunctionContext *) - _pthread_getspecific_direct(__PTK_LIBC_DYLD_Unwind_SjLj_Key); -} - -_LIBUNWIND_HIDDEN -void __Unwind_SjLj_SetTopOfFunctionStack(struct _Unwind_FunctionContext *fc) { - _pthread_setspecific_direct(__PTK_LIBC_DYLD_Unwind_SjLj_Key, fc); -} -#endif - - - - |