[PATCH] _dl_addr with prelinked libs

[PATCH] _dl_addr with prelinked libs

[Jakub Jelinek]

Hi!

Current _dl_addr sets dli_fname to _dl_argv[0] for all prelinked libraries
in addition to main program (since l_addr is 0 for them).
It should do that for the main binary only.

2002-09-27  Jakub Jelinek  <jakub@redhat.com>

	* elf/dl-addr.c (_dl_addr): Set dli_fbase to l_map_start
	unconditionally.  Set dli_fname to _dl_argv[0] only for main program.

--- libc/elf/dl-addr.c.jj	2002-09-27 08:32:30.000000000 +0200
+++ libc/elf/dl-addr.c	2002-09-27 08:42:46.000000000 +0200
@@ -60,14 +60,12 @@ _dl_addr (const void *address, Dl_info *
 
   /* Now we know what object the address lies in.  */
   info->dli_fname = match->l_name;
-  info->dli_fbase = (void *) match->l_addr;
+  info->dli_fbase = (void *) match->l_map_start;
 
   /* If this is the main program the information is incomplete.  */
-  if (__builtin_expect (info->dli_fbase == NULL, 0))
-    {
-      info->dli_fname = _dl_argv[0];
-      info->dli_fbase = (void *) match->l_map_start;
-    }
+  if (__builtin_expect (l->l_name[0], 'a') == '\0'
+      && l->l_type == lt_executable)
+    info->dli_fname = _dl_argv[0];
 
   symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]);
   strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]);

	Jakub