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

am bbf86e61: Fixes to linker code after the conflict resolution

Browse Source 
* commit 'bbf86e6157ab98af7468ce5eb3292b6509a3cabd':
  Fixes to linker code after the conflict resolution
This commit is contained in:
Dmitriy Ivanov 2014-10-02 21:35:22 +00:00 committed by Android Git Automerger
commit 812d675be9
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linker/linker.cpp
View File

@ -779,22 +779,6 @@ static void for_each_dt_needed(const soinfo* si, F action) {
}
}
static soinfo* load_library(LoadTaskList& load_tasks, const char* name, int rtld_flags, const android_dlextinfo* extinfo) {
int fd = -1;
ScopedFd file_guard(-1);
if (extinfo != nullptr && (extinfo->flags & ANDROID_DLEXT_USE_LIBRARY_FD) != 0) {
fd = extinfo->library_fd;
} else {
// Open the file.
fd = open_library(name);
if (fd == -1) {
DL_ERR("library \"%s\" not found", name);
return nullptr;
}
}
}
static soinfo* load_library(LoadTaskList& load_tasks, const char* name, int rtld_flags, const android_dlextinfo* extinfo) {
int fd = -1;
ScopedFd file_guard(-1);

2
linker/linker.h
View File

@ -217,8 +217,6 @@ struct soinfo {
ino_t get_st_ino();
dev_t get_st_dev();
int get_rtld_flags();
soinfo_list_t& get_children();

16
linker/linker_phdr.cpp
View File

@ -718,22 +718,6 @@ void phdr_table_get_dynamic_section(const ElfW(Phdr)* phdr_table, size_t phdr_co
}
return;
}
*dynamic = reinterpret_cast<ElfW(Dyn)*>(load_bias + phdr->p_vaddr);
if (dynamic_count) {
*dynamic_count = (unsigned)(phdr->p_memsz / 8);
}
if (dynamic_flags) {
*dynamic_flags = phdr->p_flags;
}
return;
}
*dynamic = nullptr;
for (const ElfW(Phdr)* phdr = phdr_table, *phdr_limit = phdr + phdr_count; phdr < phdr_limit; phdr++) {
if (phdr->p_type == PT_DYNAMIC) {
*dynamic = reinterpret_cast<ElfW(Dyn)*>(load_bias + phdr->p_vaddr);
return;
}
}
}