From c22095fcd95e12c3f9bd3408a6227b8e5c29d4d7 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Wed, 11 Nov 2020 21:30:21 -0500 Subject: [PATCH] Fix remote-unwind for TARGET_ARM crossdac (#44553) --- src/coreclr/src/pal/src/exception/remote-unwind.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/coreclr/src/pal/src/exception/remote-unwind.cpp b/src/coreclr/src/pal/src/exception/remote-unwind.cpp index 46d520f..af59515 100644 --- a/src/coreclr/src/pal/src/exception/remote-unwind.cpp +++ b/src/coreclr/src/pal/src/exception/remote-unwind.cpp @@ -1859,7 +1859,10 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pip, int nee ehFrameHdrLen = ph.p_memsz; break; -#ifdef PT_ARM_EXIDX +#if defined(TARGET_ARM) +#ifndef PT_ARM_EXIDX +#define PT_ARM_EXIDX 0x70000001 /* See llvm ELF.h */ +#endif /* !PT_ARM_EXIDX */ case PT_ARM_EXIDX: exidxFrameHdrAddr = loadbias + ph.p_vaddr; exidxFrameHdrLen = ph.p_memsz; -- 2.7.4