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

am f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"

Browse Source 
* commit 'f4320e867cbc7764d2f1fa8ac64da9cc38cba733':
  Resolve "unused DT entry" warnings for x86_64
This commit is contained in:
Dmitriy Ivanov 2014-10-06 19:14:51 +00:00 committed by Android Git Automerger
commit b9d4a64866
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linker/linker.cpp
View File

@ -1936,14 +1936,19 @@ bool soinfo::PrelinkImage() {
return false;
}
break;
#if !defined(__LP64__)
case DT_PLTREL:
if (d->d_un.d_val != DT_REL) {
DL_ERR("unsupported DT_RELA in \"%s\"", name);
#if defined(USE_RELA)
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;
}
break;
#endif
break;
case DT_JMPREL:
#if defined(USE_RELA)
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;
break;
#endif
case DT_VERSYM:
case DT_VERDEF:
case DT_VERDEFNUM:
// Ignore: bionic does not support symbol versioning...
break;
default:
if (!relocating_linker) {