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

Refactoring: extract lookup_version_info(..)

Browse Source 
Change-Id: I47f9c21a1738dc520fd83281c8227dc3a7e79650
(cherry picked from commit 31b408d2c2)
This commit is contained in:
Dmitriy Ivanov
2015-04-30 16:11:48 -07:00
parent 62075bcc91
commit 114bd835a7
3 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
linker/linker_mips.cpp
View File

@@ -75,26 +75,14 @@ bool soinfo::relocate(ElfRelIteratorT&& rel_iterator,
if (sym != 0) {
sym_name = get_string(symtab_[sym].st_name);
const ElfW(Versym)* sym_ver_ptr = get_versym(sym);
ElfW(Versym) sym_ver = sym_ver_ptr == nullptr ? 0 : *sym_ver_ptr;
const version_info* vi = nullptr;
if (sym_ver == VER_NDX_LOCAL || sym_ver == VER_NDX_GLOBAL) {
// there is no version info for this one
if (!soinfo_do_lookup(this, sym_name, nullptr, &lsi, global_group, local_group, &s)) {
return false;
}
} else {
const version_info* vi = version_tracker.get_version_info(sym_ver);
if (!lookup_version_info(version_tracker, sym, sym_name, &vi)) {
return false;
}
if (vi == nullptr) {
DL_ERR("cannot find verneed/verdef for version index=%d "
"referenced by symbol \"%s\" at \"%s\"", sym_ver, sym_name, get_soname());
return false;
}
if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) {
return false;
}
if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) {
return false;
}
if (s == nullptr) {