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

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

Browse Source 
Change-Id: I44d84a95f506e89e77cce8c218083a80ca5724b9
This commit is contained in:
Dmitriy Ivanov 2014-10-02 10:54:08 -07:00
commit 9b6b6e6d4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -2183,11 +2183,11 @@ bool soinfo::LinkImage(const android_dlextinfo* extinfo) {
// they cannot be resolved until the rest of the relocations are done // they cannot be resolved until the rest of the relocations are done
// because we need to call the resolution function which may be waiting // because we need to call the resolution function which may be waiting
// on relocations. // on relocations.
if(si->get_has_ifuncs()) { if(get_has_ifuncs()) {
#if defined(__i386__) #if defined(__i386__)
soinfo_ifunc_relocate(si, si->plt_rel, si->plt_rel_count, needed); soinfo_ifunc_relocate(this, plt_rel, plt_rel_count);
#elif defined(__x86_64__) #elif defined(__x86_64__)
soinfo_ifunc_relocate(si, si->plt_rela, si->plt_rela_count, needed); soinfo_ifunc_relocate(this, plt_rela, plt_rela_count);
#endif #endif
} }