mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
Update.
2003-09-30 Ulrich Drepper <drepper@redhat.com> * elf/rtld.c (dl_main): Also set l_map_start. 2003-09-30 Daniel Jacobowitz <drow@mvista.com> * elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO to work around kernel problem.
This commit is contained in:
parent
94ae6d75ad
commit
f556dbfa41
@ -1,3 +1,12 @@
|
||||
2003-09-30 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* elf/rtld.c (dl_main): Also set l_map_start.
|
||||
|
||||
2003-09-30 Daniel Jacobowitz <drow@mvista.com>
|
||||
|
||||
* elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO
|
||||
to work around kernel problem.
|
||||
|
||||
2003-09-27 Wolfram Gloger <wg@malloc.de>
|
||||
|
||||
* sysdeps/pthread/malloc-machine.h: New file.
|
||||
|
16
elf/rtld.c
16
elf/rtld.c
@ -1153,7 +1153,7 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
struct link_map *l = _dl_new_object ((char *) "", "", lt_library, NULL);
|
||||
if (__builtin_expect (l != NULL, 1))
|
||||
{
|
||||
static ElfW(Dyn) dyn_temp [DL_RO_DYN_TEMP_CNT];
|
||||
static ElfW(Dyn) dyn_temp[DL_RO_DYN_TEMP_CNT];
|
||||
|
||||
l->l_phdr = ((const void *) GL(dl_sysinfo_dso)
|
||||
+ GL(dl_sysinfo_dso)->e_phoff);
|
||||
@ -1173,12 +1173,22 @@ of this helper program; chances are you did not intend to run this program.\n\
|
||||
elf_get_dynamic_info (l, dyn_temp);
|
||||
_dl_setup_hash (l);
|
||||
l->l_relocated = 1;
|
||||
l->l_map_start = GL(dl_sysinfo_dso);
|
||||
|
||||
/* Now that we have the info handy, use the DSO image's soname
|
||||
so this object can be looked up by name. */
|
||||
if (l->l_info[DT_SONAME] != NULL)
|
||||
l->l_libname->name = ((char *) D_PTR (l, l_info[DT_STRTAB])
|
||||
+ l->l_info[DT_SONAME]->d_un.d_val);
|
||||
{
|
||||
/* Work around a kernel problem. The kernel cannot handle
|
||||
addresses in the vsyscall DSO pages in writev() calls. */
|
||||
const char *dsoname = ((char *) D_PTR (l, l_info[DT_STRTAB])
|
||||
+ l->l_info[DT_SONAME]->d_un.d_val);
|
||||
size_t len = strlen (dsoname);
|
||||
l->l_name = (char *) malloc (len);
|
||||
if (l->l_name == NULL)
|
||||
_dl_fatal_printf ("out of memory\n");
|
||||
l->l_libname->name = memcpy (l->l_name, dsoname, len);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user