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

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

Browse Source 
Change-Id: Ie7f85be196a44ab59554384274f2022239f91b0e
This commit is contained in:
Dmitriy Ivanov 2014-10-02 09:59:26 -07:00
commit 88eb2a9cf5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -1737,11 +1737,9 @@ void soinfo::set_st_ino(ino_t ino) {
} }
void soinfo::set_has_ifuncs(bool ifuncs) { void soinfo::set_has_ifuncs(bool ifuncs) {
if ((this->flags & FLAG_NEW_SOINFO) == 0) { if (has_min_version(1)) {
return; has_ifuncs = ifuncs;
} }
has_ifuncs = ifuncs;
} }
dev_t soinfo::get_st_dev() { dev_t soinfo::get_st_dev() {