diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-12-27 22:47:11 -0600 |
|---|---|---|
| committer | Dave Watson <dade.watson@gmail.com> | 2022-12-28 09:43:54 -0800 |
| commit | d25b9e0a9a8a51921b7e34e7e14a011c23c0175b (patch) | |
| tree | 847263431a97830c238f56e26daf2cc66e80acbc | |
| parent | b0b4d98804bf28d9afd71919a8800e7c5a13b4e6 (diff) | |
| download | libunwind-d25b9e0a9a8a51921b7e34e7e14a011c23c0175b.tar.gz | |
fix the way load offset is detected so it works with lld linker
| -rw-r--r-- | src/coredump/_UCD_get_proc_name.c | 3 | ||||
| -rw-r--r-- | src/elfxx.c | 10 | ||||
| -rw-r--r-- | src/elfxx.h | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/coredump/_UCD_get_proc_name.c b/src/coredump/_UCD_get_proc_name.c index aeec3c9b..cff587b0 100644 --- a/src/coredump/_UCD_get_proc_name.c +++ b/src/coredump/_UCD_get_proc_name.c @@ -101,10 +101,9 @@ elf_w (CD_get_proc_name) (struct UCD_info *ui, unw_addr_space_t as, unw_word_t i } segbase = 0; /* everything is relative to the beginning of the ELF file */ - mapoff = 0; /* Adjust IP to be relative to start of the .text section of the ELF file */ ip = ip - cphdr->p_vaddr + _get_text_offset (ui->edi.ei.image); - ret = elf_w (get_proc_name_in_image) (as, &ui->edi.ei, segbase, mapoff, ip, buf, buf_len, offp); + ret = elf_w (get_proc_name_in_image) (as, &ui->edi.ei, segbase, ip, buf, buf_len, offp); return ret; } diff --git a/src/elfxx.c b/src/elfxx.c index 2f9d1593..92bcde32 100644 --- a/src/elfxx.c +++ b/src/elfxx.c @@ -158,8 +158,7 @@ elf_w (lookup_symbol) (unw_addr_space_t as, } static Elf_W (Addr) -elf_w (get_load_offset) (struct elf_image *ei, unsigned long segbase, - unsigned long mapoff) +elf_w (get_load_offset) (struct elf_image *ei, unsigned long segbase) { Elf_W (Addr) offset = 0; Elf_W (Ehdr) *ehdr; @@ -175,7 +174,7 @@ elf_w (get_load_offset) (struct elf_image *ei, unsigned long segbase, phdr = (Elf_W (Phdr) *) ((char *) ei->image + ehdr->e_phoff); for (i = 0; i < ehdr->e_phnum; ++i) - if (phdr[i].p_type == PT_LOAD && (phdr[i].p_offset & pagesize_alignment_mask) == mapoff) + if (phdr[i].p_type == PT_LOAD && phdr[i].p_flags & PF_X) { offset = segbase - phdr[i].p_vaddr + (phdr[i].p_offset & (~pagesize_alignment_mask)); break; @@ -276,7 +275,6 @@ elf_w (extract_minidebuginfo) (struct elf_image *ei, struct elf_image *mdi) HIDDEN int elf_w (get_proc_name_in_image) (unw_addr_space_t as, struct elf_image *ei, unsigned long segbase, - unsigned long mapoff, unw_word_t ip, char *buf, size_t buf_len, unw_word_t *offp) { @@ -284,7 +282,7 @@ elf_w (get_proc_name_in_image) (unw_addr_space_t as, struct elf_image *ei, Elf_W (Addr) min_dist = ~(Elf_W (Addr))0; int ret; - load_offset = elf_w (get_load_offset) (ei, segbase, mapoff); + load_offset = elf_w (get_load_offset) (ei, segbase); ret = elf_w (lookup_symbol) (as, ip, ei, load_offset, buf, buf_len, &min_dist); /* If the ELF image has MiniDebugInfo embedded in it, look up the symbol in @@ -328,7 +326,7 @@ elf_w (get_proc_name) (unw_addr_space_t as, pid_t pid, unw_word_t ip, if (ret < 0) return ret; - ret = elf_w (get_proc_name_in_image) (as, &ei, segbase, mapoff, ip, buf, buf_len, offp); + ret = elf_w (get_proc_name_in_image) (as, &ei, segbase, ip, buf, buf_len, offp); munmap (ei.image, ei.size); ei.image = NULL; diff --git a/src/elfxx.h b/src/elfxx.h index fe5fcbcd..cd36eb42 100644 --- a/src/elfxx.h +++ b/src/elfxx.h @@ -50,7 +50,6 @@ extern int elf_w (get_proc_name) (unw_addr_space_t as, extern int elf_w (get_proc_name_in_image) (unw_addr_space_t as, struct elf_image *ei, unsigned long segbase, - unsigned long mapoff, unw_word_t ip, char *buf, size_t buf_len, unw_word_t *offp); |