generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linker: Compute symbol name before lookup so we can also use it for error msg

Browse Source 
Signed-off-by: Dima Zavin <dima@android.com>
This commit is contained in:
Dima Zavin 2009-05-12 10:59:09 -07:00
parent 5e56370038
commit d1b40d8c69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker/linker.c
View File

@ -1121,7 +1121,8 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
DEBUG("%5d Processing '%s' relocation at index %d\n", pid, DEBUG("%5d Processing '%s' relocation at index %d\n", pid,
si->name, idx); si->name, idx);
if(sym != 0) { if(sym != 0) {
s = _do_lookup(si, strtab + symtab[sym].st_name, &base); sym_name = (char *)(strtab + symtab[sym].st_name);
s = _do_lookup(si, sym_name, &base);
if(s == 0) { if(s == 0) {
ERROR("%5d cannot locate '%s'...\n", pid, sym_name); ERROR("%5d cannot locate '%s'...\n", pid, sym_name);
return -1; return -1;
@ -1141,7 +1142,6 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
return -1; return -1;
} }
sym_addr = (unsigned)(s->st_value + base); sym_addr = (unsigned)(s->st_value + base);
sym_name = (char *)(strtab + symtab[sym].st_name);
COUNT_RELOC(RELOC_SYMBOL); COUNT_RELOC(RELOC_SYMBOL);
} else { } else {
s = 0; s = 0;