diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | addr2line.c | 16 |
2 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Apr 1 07:37:00 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * addr2line.c (fill_lines): use dynsym, which is used for dynamic + linking and always exists, if there's no symtab. + Tue Apr 1 07:27:15 2014 NARUSE, Yui <naruse@ruby-lang.org> * vm_dump.c (rb_print_backtrace): current implementation diff --git a/addr2line.c b/addr2line.c index 71cec4cb8f..1094b60b98 100644 --- a/addr2line.c +++ b/addr2line.c @@ -464,8 +464,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink, int fd; off_t filesize; char *file; - ElfW(Shdr) *symtab_shdr = NULL; - ElfW(Shdr) *strtab_shdr = NULL; + ElfW(Shdr) *symtab_shdr = NULL, *strtab_shdr = NULL; + ElfW(Shdr) *dynsym_shdr = NULL, *dynstr_shdr = NULL; fd = open(binary_filename, O_RDONLY); if (fd < 0) { @@ -532,11 +532,18 @@ fill_lines(int num_traces, void **traces, int check_debuglink, if (!strcmp(section_name, ".strtab")) { strtab_shdr = shdr + i; } + else if (!strcmp(section_name, ".dynstr")) { + dynstr_shdr = shdr + i; + } break; case SHT_SYMTAB: /* if (!strcmp(section_name, ".symtab")) */ symtab_shdr = shdr + i; break; + case SHT_DYNSYM: + /* if (!strcmp(section_name, ".dynsym")) */ + dynsym_shdr = shdr + i; + break; case SHT_PROGBITS: if (!strcmp(section_name, ".debug_line")) { debug_line_shdr = shdr + i; @@ -548,6 +555,11 @@ fill_lines(int num_traces, void **traces, int check_debuglink, } } + if (!symtab_shdr) { + symtab_shdr = dynsym_shdr; + strtab_shdr = dynstr_shdr; + } + if (symtab_shdr && strtab_shdr) { char *strtab = file + strtab_shdr->sh_offset; ElfW(Sym) *symtab = (ElfW(Sym) *)(file + symtab_shdr->sh_offset); |