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

am 5d436ddc: am 8213d5c3: am ff7b46b8: Merge change I3c998761 into eclair

Browse Source 
Merge commit '5d436ddcae640e2b2af30a5654bec33273b7a9c3'

* commit '5d436ddcae640e2b2af30a5654bec33273b7a9c3':
  Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
This commit is contained in:
David 'Digit' Turner 2009-10-16 12:57:19 -07:00 committed by Android Git Automerger
commit 79d23e28ed
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linker/linker.c
View File

@ -1241,9 +1241,13 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
return -1;
}
#endif
if ((s->st_shndx == SHN_UNDEF) && (s->st_value != 0)) {
DL_ERR("%5d In '%s', shndx=%d && value=0x%08x. We do not "
"handle this yet", pid, si->name, s->st_shndx,
// st_shndx==SHN_UNDEF means an undefined symbol.
// st_value should be 0 then, except that the low bit of st_value is
// used to indicate whether the symbol points to an ARM or thumb function,
// and should be ignored in the following check.
if ((s->st_shndx == SHN_UNDEF) && ((s->st_value & ~1) != 0)) {
DL_ERR("%5d In '%s', symbol=%s shndx=%d && value=0x%08x. We do not "
"handle this yet", pid, si->name, sym_name, s->st_shndx,
s->st_value);
return -1;
}