M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

Libunwind: use dyld instead of static linker symbols for unwind section.

Browse Source
This commit is contained in:
pca006132 2020-06-30 17:12:02 +08:00
parent b21cccb4d2
commit f82ffe8cf2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/llvm_libunwind/src/AddressSpace.hpp
View File

@ -392,6 +392,10 @@ LocalAddressSpace::getEncodedP(pint_t &addr, pint_t end, uint8_t encoding,
return result; return result;
} }
extern "C" {
uintptr_t dl_unwind_find_exidx(uintptr_t pc, int *length);
}
inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr,
UnwindInfoSections &info) { UnwindInfoSections &info) {
#ifdef __APPLE__ #ifdef __APPLE__
@ -421,9 +425,11 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr,
if (info.dwarf_section_length) if (info.dwarf_section_length)
return true; return true;
#elif defined(_LIBUNWIND_ARM_EHABI) && defined(_LIBUNWIND_IS_BAREMETAL) #elif defined(_LIBUNWIND_ARM_EHABI) && defined(_LIBUNWIND_IS_BAREMETAL)
// Bare metal is statically linked, so no need to ask the dynamic loader // patched as our baremetal solution has a dynamic loader...
info.arm_section = (uintptr_t)(&__exidx_start); int length = 0;
info.arm_section_length = (uintptr_t)(&__exidx_end - &__exidx_start); info.arm_section =
(uintptr_t)dl_unwind_find_exidx((uintptr_t)targetAddr, &length);
info.arm_section_length = (uintptr_t)length * sizeof(EHABIIndexEntry);
_LIBUNWIND_TRACE_UNWINDING("findUnwindSections: section %p length %p", _LIBUNWIND_TRACE_UNWINDING("findUnwindSections: section %p length %p",
(void *)info.arm_section, (void *)info.arm_section_length); (void *)info.arm_section, (void *)info.arm_section_length);
if (info.arm_section && info.arm_section_length) if (info.arm_section && info.arm_section_length)