Skip to content

Commit

Permalink
Better debug information from ld.so
Browse files Browse the repository at this point in the history
Differentiate between loading as a dependency and loading on request.
  • Loading branch information
drepper committed Aug 12, 2011
1 parent 8e999d2 commit 9ac533d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2011-08-12 Ulrich Drepper <[email protected]>

* elf/dl-load.c (_dl_map_object): Show in debug output whether a DSO
was a dependency or dynamically loaded.

2011-08-11 Ulrich Drepper <[email protected]>

* intl/l10nflist.c: Allow architecture-specific pop function.
Expand Down
8 changes: 5 additions & 3 deletions elf/dl-load.c
Original file line number Diff line number Diff line change
Expand Up @@ -2094,9 +2094,11 @@ _dl_map_object (struct link_map *loader, const char *name,
/* Display information if we are debugging. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)
&& loader != NULL)
_dl_debug_printf ("\nfile=%s [%lu]; needed by %s [%lu]\n", name, nsid,
loader->l_name[0]
? loader->l_name : rtld_progname, loader->l_ns);
_dl_debug_printf ((mode & __RTLD_DLOPEN) == 0
? "\nfile=%s [%lu]; needed by %s [%lu]\n"
: "\nfile=%s [%lu]; dynamically loaded by %s [%lu]\n",
name, nsid, loader->l_name[0]
? loader->l_name : rtld_progname, loader->l_ns);

#ifdef SHARED
/* Give the auditing libraries a chance to change the name before we
Expand Down

0 comments on commit 9ac533d

Please sign in to comment.