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

resolved conflicts for merge of ae69a958 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ia466577ef6e627cc6fcef46aa37cce21acbc8519
This commit is contained in:
Dmitriy Ivanov
2014-10-02 12:16:19 -07:00
parent e3105fee22 ae69a9584b
commit 6aac3cd112
8 changed files with 513 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
linker/linker_phdr.cpp
View File

@@ -729,8 +729,11 @@ void phdr_table_get_dynamic_section(const ElfW(Phdr)* phdr_table, size_t phdr_co
return;
}
*dynamic = nullptr;
if (dynamic_count) {
*dynamic_count = 0;
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;
}
}
}