diff options
| author |   patrick <patrick@openbsd.org> | 2019-02-04 16:54:30 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2019-02-04 16:54:30 +0000 |
| commit | 7eed64eca19d93cd26421fb274e8122f37fa801c (patch) | |
| tree | a6569517048137f1570c831cd23974d56e362c29 /lib/libunwind/src/UnwindLevel1-gcc-ext.c | |
| parent | Make gl_pathc, gl_matchc and gl_offs size_t in glob_t to match POSIX. (diff) | |
| download | wireguard-openbsd-7eed64eca19d93cd26421fb274e8122f37fa801c.tar.xz wireguard-openbsd-7eed64eca19d93cd26421fb274e8122f37fa801c.zip | |
Import libunwind 7.0.1
Diffstat (limited to 'lib/libunwind/src/UnwindLevel1-gcc-ext.c')
| -rw-r--r-- | lib/libunwind/src/UnwindLevel1-gcc-ext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libunwind/src/UnwindLevel1-gcc-ext.c b/lib/libunwind/src/UnwindLevel1-gcc-ext.c index 10619ba431d..38f141e381d 100644 --- a/lib/libunwind/src/UnwindLevel1-gcc-ext.c +++ b/lib/libunwind/src/UnwindLevel1-gcc-ext.c @@ -33,9 +33,9 @@ _Unwind_Resume_or_Rethrow(_Unwind_Exception *exception_object) { (void *)exception_object, (long)exception_object->unwinder_cache.reserved1); #else - _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%ld", + _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%" PRIdPTR, (void *)exception_object, - (long)exception_object->private_1); + (intptr_t)exception_object->private_1); #endif #if defined(_LIBUNWIND_ARM_EHABI) @@ -92,9 +92,9 @@ _LIBUNWIND_EXPORT void *_Unwind_FindEnclosingFunction(void *pc) { unw_proc_info_t info; unw_getcontext(&uc); unw_init_local(&cursor, &uc); - unw_set_reg(&cursor, UNW_REG_IP, (unw_word_t)(long) pc); + unw_set_reg(&cursor, UNW_REG_IP, (unw_word_t)(intptr_t) pc); if (unw_get_proc_info(&cursor, &info) == UNW_ESUCCESS) - return (void *)(long) info.start_ip; + return (void *)(intptr_t) info.start_ip; else return NULL; } @@ -190,14 +190,14 @@ _LIBUNWIND_EXPORT const void *_Unwind_Find_FDE(const void *pc, unw_proc_info_t info; unw_getcontext(&uc); unw_init_local(&cursor, &uc); - unw_set_reg(&cursor, UNW_REG_IP, (unw_word_t)(long) pc); + unw_set_reg(&cursor, UNW_REG_IP, (unw_word_t)(intptr_t) pc); unw_get_proc_info(&cursor, &info); bases->tbase = (uintptr_t)info.extra; bases->dbase = 0; // dbase not used on Mac OS X bases->func = (uintptr_t)info.start_ip; _LIBUNWIND_TRACE_API("_Unwind_Find_FDE(pc=%p) => %p", pc, - (void *)(long) info.unwind_info); - return (void *)(long) info.unwind_info; + (void *)(intptr_t) info.unwind_info); + return (void *)(intptr_t) info.unwind_info; } /// Returns the CFA (call frame area, or stack pointer at start of function) |