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

resolved conflicts for merge of c191a8ad to lmp-dev-plus-aosp

Browse Source 
Change-Id: I24dcf9701ebe3344796f757a596754cbefbf358a
This commit is contained in:
Dmitriy Ivanov
2014-09-01 14:34:15 -07:00
parent a20e37f291 c191a8adee
commit e4c4311f44
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
linker/linker.cpp
View File

@@ -525,6 +525,15 @@ static ElfW(Sym)* soinfo_do_lookup(soinfo* si, const char* name, soinfo** lsi, s
*lsi = si; *lsi = si;
goto done; goto done;
} }
/* Next, look for it in the preloads list */
for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != NULL) {
*lsi = g_ld_preloads[i];
goto done;
}
}
} else { } else {
/* Order of symbol lookup is controlled by DT_SYMBOLIC flag */ /* Order of symbol lookup is controlled by DT_SYMBOLIC flag */
@@ -542,6 +551,15 @@ static ElfW(Sym)* soinfo_do_lookup(soinfo* si, const char* name, soinfo** lsi, s
*lsi = somain; *lsi = somain;
goto done; goto done;
} }
/* Next, look for it in the preloads list */
for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != NULL) {
*lsi = g_ld_preloads[i];
goto done;
}
}
} }
/* Look for symbols in the local scope (the object who is /* Look for symbols in the local scope (the object who is
@@ -573,18 +591,18 @@ static ElfW(Sym)* soinfo_do_lookup(soinfo* si, const char* name, soinfo** lsi, s
*lsi = somain; *lsi = somain;
goto done; goto done;
} }
}
}
}
/* Next, look for it in the preloads list */ /* Next, look for it in the preloads list */
for (int i = 0; g_ld_preloads[i] != nullptr; i++) { for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name); s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != nullptr) { if (s != NULL) {
*lsi = g_ld_preloads[i]; *lsi = g_ld_preloads[i];
goto done; goto done;
} }
} }
}
}
}
for (int i = 0; needed[i] != nullptr; i++) { for (int i = 0; needed[i] != nullptr; i++) {
DEBUG("%s: looking up %s in %s", DEBUG("%s: looking up %s in %s",