From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] _dl_addr with prelinked libs
Date: Thu, 26 Sep 2002 23:44:00 -0000 [thread overview]
Message-ID: <20020927084342.O2194@sunsite.ms.mff.cuni.cz> (raw)
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
reply other threads:[~2002-09-27 6:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020927084342.O2194@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
--cc=roland@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).