summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-03-29 15:49:42 -0700
committerAndroid Code Review <code-review@android.com>2010-03-29 15:49:42 -0700
commit4ad72f89b12fe0157074a253190f6aa2cbfe15ac (patch)
treef1b76dea170bdd2b4a107034958fd82de3c2eb2c
parent8ab5b02b5f58d9b2f050a98b189284a3d6263d7b (diff)
parent3cab22c8cf0dcf30718a1452ce9cbb637876cea3 (diff)
downloadbionic-4ad72f89b12fe0157074a253190f6aa2cbfe15ac.zip
bionic-4ad72f89b12fe0157074a253190f6aa2cbfe15ac.tar.gz
bionic-4ad72f89b12fe0157074a253190f6aa2cbfe15ac.tar.bz2
Merge "linker: fix the undefined weak symbols issue"
-rw-r--r--linker/linker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker.c b/linker/linker.c
index f5294d9..87fb19b 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -471,7 +471,7 @@ _do_lookup(soinfo *si, const char *name, unsigned *base)
DEBUG("%5d %s: looking up %s in %s\n",
pid, si->name, name, lsi->name);
s = _do_lookup_in_so(lsi, name, &elf_hash);
- if(s != NULL)
+ if ((s != NULL) && (s->st_shndx != SHN_UNDEF))
goto done;
}
}