qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* elf/dl-addr.c (_dl_addr): Fill in correct information if symbol
	is in main program.
	* elf/Versions [ld] (GLIBC_2.2): Export _dl_argv.
This commit is contained in:
Ulrich Drepper 2000-06-08 02:19:27 +00:00
parent 1c14af448e
commit b8565e7817
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-06-07 Ulrich Drepper <drepper@redhat.com> 2000-06-07 Ulrich Drepper <drepper@redhat.com>
* elf/dl-addr.c (_dl_addr): Fill in correct information if symbol
is in main program.
* elf/Versions [ld] (GLIBC_2.2): Export _dl_argv.
* elf/dl-addr.c (_dl_addr): Do exact testing of address range * elf/dl-addr.c (_dl_addr): Do exact testing of address range
using l_map_start and l_map_end. using l_map_start and l_map_end.

2
elf/Versions
View File

@ -52,7 +52,7 @@ ld {
_dl_dst_count; _dl_dst_substitute; _dl_dst_count; _dl_dst_substitute;
} }
GLIBC_2.2 { GLIBC_2.2 {
_dl_init; _dl_load_lock; _dl_init; _dl_load_lock; _dl_argv;
# this is defined in ld.so and overridden by libc # this is defined in ld.so and overridden by libc
_dl_init_first; _dl_init_first;

7
elf/dl-addr.c
View File

@ -63,6 +63,13 @@ _dl_addr (const void *address, Dl_info *info)
info->dli_fname = match->l_name; info->dli_fname = match->l_name;
info->dli_fbase = (void *) match->l_addr; info->dli_fbase = (void *) match->l_addr;
/* 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;
}
symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]); symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]);
strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]); strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]);