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

am fc48e8cf: Merge "Remove unused variables not spotted by GCC."

Browse Source 
* commit 'fc48e8cf28b80ce0f95e288eeee459b4cb932afa':
  Remove unused variables not spotted by GCC.
This commit is contained in:
Elliott Hughes 2014-02-13 01:30:18 +00:00 committed by Android Git Automerger
commit 97a376d856
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linker/linker.cpp
View File

@ -835,10 +835,7 @@ int do_dlclose(soinfo* si) {
#if defined(USE_RELA) #if defined(USE_RELA)
static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo* needed[]) { static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo* needed[]) {
ElfW(Sym)* symtab = si->symtab;
const char* strtab = si->strtab;
ElfW(Sym)* s; ElfW(Sym)* s;
ElfW(Rela)* start = rela;
soinfo* lsi; soinfo* lsi;
for (size_t idx = 0; idx < count; ++idx, ++rela) { for (size_t idx = 0; idx < count; ++idx, ++rela) {
@ -853,11 +850,11 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
continue; continue;
} }
if (sym != 0) { if (sym != 0) {
sym_name = reinterpret_cast<const char*>(strtab + symtab[sym].st_name); sym_name = reinterpret_cast<const char*>(si->strtab + si->symtab[sym].st_name);
s = soinfo_do_lookup(si, sym_name, &lsi, needed); s = soinfo_do_lookup(si, sym_name, &lsi, needed);
if (s == NULL) { if (s == NULL) {
// We only allow an undefined symbol if this is a weak reference... // We only allow an undefined symbol if this is a weak reference...
s = &symtab[sym]; s = &si->symtab[sym];
if (ELF_ST_BIND(s->st_info) != STB_WEAK) { if (ELF_ST_BIND(s->st_info) != STB_WEAK) {
DL_ERR("cannot locate symbol \"%s\" referenced by \"%s\"...", sym_name, si->name); DL_ERR("cannot locate symbol \"%s\" referenced by \"%s\"...", sym_name, si->name);
return -1; return -1;
@ -1136,10 +1133,7 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
#else // REL, not RELA. #else // REL, not RELA.
static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* needed[]) { static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* needed[]) {
ElfW(Sym)* symtab = si->symtab;
const char* strtab = si->strtab;
ElfW(Sym)* s; ElfW(Sym)* s;
ElfW(Rel)* start = rel;
soinfo* lsi; soinfo* lsi;
for (size_t idx = 0; idx < count; ++idx, ++rel) { for (size_t idx = 0; idx < count; ++idx, ++rel) {
@ -1155,11 +1149,11 @@ static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* n
continue; continue;
} }
if (sym != 0) { if (sym != 0) {
sym_name = reinterpret_cast<const char*>(strtab + symtab[sym].st_name); sym_name = reinterpret_cast<const char*>(si->strtab + si->symtab[sym].st_name);
s = soinfo_do_lookup(si, sym_name, &lsi, needed); s = soinfo_do_lookup(si, sym_name, &lsi, needed);
if (s == NULL) { if (s == NULL) {
// We only allow an undefined symbol if this is a weak reference... // We only allow an undefined symbol if this is a weak reference...
s = &symtab[sym]; s = &si->symtab[sym];
if (ELF_ST_BIND(s->st_info) != STB_WEAK) { if (ELF_ST_BIND(s->st_info) != STB_WEAK) {
DL_ERR("cannot locate symbol \"%s\" referenced by \"%s\"...", sym_name, si->name); DL_ERR("cannot locate symbol \"%s\" referenced by \"%s\"...", sym_name, si->name);
return -1; return -1;