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

linker: Give more context for failures during library dependency resolution.

Browse Source 
Signed-off-by: Dima Zavin <dima@android.com>
This commit is contained in:
Dima Zavin 2009-05-29 17:30:25 -07:00
parent 2e85579c34
commit 0353195f34
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linker/linker.c
View File

@ -116,6 +116,7 @@ HOODLUM(free, void, (void *ptr));
HOODLUM(realloc, void *, (void *ptr, size_t size)); HOODLUM(realloc, void *, (void *ptr, size_t size));
HOODLUM(calloc, void *, (size_t cnt, size_t size)); HOODLUM(calloc, void *, (size_t cnt, size_t size));
static char tmp_err_buf[768];
static char __linker_dl_err_buf[768]; static char __linker_dl_err_buf[768];
#define DL_ERR(fmt, x...) \ #define DL_ERR(fmt, x...) \
do { \ do { \
@ -1615,7 +1616,9 @@ static int link_image(soinfo *si, unsigned wr_offset)
DEBUG("%5d %s needs %s\n", pid, si->name, si->strtab + d[1]); DEBUG("%5d %s needs %s\n", pid, si->name, si->strtab + d[1]);
soinfo *lsi = find_library(si->strtab + d[1]); soinfo *lsi = find_library(si->strtab + d[1]);
if(lsi == 0) { if(lsi == 0) {
DL_ERR("%5d could not load '%s'\n", pid, si->strtab + d[1]); strlcpy(tmp_err_buf, linker_get_error(), sizeof(tmp_err_buf));
DL_ERR("%5d could not load needed library '%s' for '%s' (%s)\n",
pid, si->strtab + d[1], si->name, tmp_err_buf);
goto fail; goto fail;
} }
lsi->refcount++; lsi->refcount++;