merge from open-source master

Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db
This commit is contained in:
The Android Open Source Project
2010-04-21 09:10:08 -07:00
3 changed files with 15 additions and 5 deletions

View File

@@ -509,13 +509,17 @@ Elf32_Sym *lookup_in_library(soinfo *si, const char *name)
/* This is used by dl_sym(). It performs a global symbol lookup.
*/
Elf32_Sym *lookup(const char *name, soinfo **found)
Elf32_Sym *lookup(const char *name, soinfo **found, soinfo *start)
{
unsigned elf_hash = elfhash(name);
Elf32_Sym *s = NULL;
soinfo *si;
for(si = solist; (s == NULL) && (si != NULL); si = si->next)
if(start == NULL) {
start = solist;
}
for(si = start; (s == NULL) && (si != NULL); si = si->next)
{
if(si->flags & FLAG_ERROR)
continue;