summaryrefslogtreecommitdiffstats
path: root/linker/linker.c
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-04-21 09:10:08 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-04-21 09:10:08 -0700
commit5ef5272be985dfdeafa86077c306f6b64d334240 (patch)
treebad11901e83b227c7bac5e773ad6e06cf4eda089 /linker/linker.c
parent95faecefdea0f55edafdba09052a904df7cd2405 (diff)
parent1698d9ebfc7e27271852a1fdf305a2ac37b3ebe4 (diff)
downloadbionic-5ef5272be985dfdeafa86077c306f6b64d334240.zip
bionic-5ef5272be985dfdeafa86077c306f6b64d334240.tar.gz
bionic-5ef5272be985dfdeafa86077c306f6b64d334240.tar.bz2
merge from open-source master
Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db
Diffstat (limited to 'linker/linker.c')
-rw-r--r--linker/linker.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/linker/linker.c b/linker/linker.c
index 6719b12..a1f4fff 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -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;