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

Resolve "unused DT entry" warnings for x86_64

Browse Source 
Bug: 18186310

(cherry picked from commit 513e29e16f16a6ffa1636ba282d599fd6b437aeb)

Change-Id: I1e4c5af2cdc09dc978c7a78fcdcf8796c919751e
This commit is contained in:
Dmitriy Ivanov 2014-10-06 11:30:43 -07:00
parent c87f65d2cd
commit 1d3e81a9e7
1 changed files with 14 additions and 4 deletions

18
linker/linker.cpp

@ -1936,14 +1936,19 @@ bool soinfo::PrelinkImage() {
return false; return false;
} }
break; break;
#if !defined(__LP64__)
case DT_PLTREL: case DT_PLTREL:
if (d->d_un.d_val != DT_REL) { #if defined(USE_RELA)
DL_ERR("unsupported DT_RELA in \"%s\"", name); if (d->d_un.d_val != DT_RELA) {
DL_ERR("unsupported DT_PLTREL in \"%s\"; expected DT_RELA", name);
return false;
}
#else
if (d->d_un.d_val != DT_REL) {
DL_ERR("unsupported DT_PLTREL in \"%s\"; expected DT_REL", name);
return false; return false;
} }
break;
#endif #endif
break;
case DT_JMPREL: case DT_JMPREL:
#if defined(USE_RELA) #if defined(USE_RELA)
plt_rela = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr); plt_rela = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr);
@ -2120,6 +2125,11 @@ bool soinfo::PrelinkImage() {
mips_gotsym = d->d_un.d_val; mips_gotsym = d->d_un.d_val;
break; break;
#endif #endif
case DT_VERSYM:
case DT_VERDEF:
case DT_VERDEFNUM:
// Ignore: bionic does not support symbol versioning...
break;
default: default:
if (!relocating_linker) { if (!relocating_linker) {