[commits] r14921 - in /fsf/trunk/libc: ChangeLog elf/dl-load.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Aug 13 00:03:18 2011
New Revision: 14921

Log:
Import glibc-mainline for 2011-08-13

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/dl-load.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Aug 13 00:03:18 2011
@@ -1,3 +1,8 @@
+2011-08-12  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* 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  <drepper@xxxxxxxxx>
 
 	* intl/l10nflist.c: Allow architecture-specific pop function.

Modified: fsf/trunk/libc/elf/dl-load.c
==============================================================================
--- fsf/trunk/libc/elf/dl-load.c (original)
+++ fsf/trunk/libc/elf/dl-load.c Sat Aug 13 00:03:18 2011
@@ -2094,9 +2094,11 @@
   /* 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_CALLMAP) == 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