AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.Update.

Browse Source 
2003-05-20  Jakub Jelinek  <jakub@redhat.com>

	* elf/dynamic-link.h (elf_get_dynamic_info): Add temp argument.
	If temp != NULL, copy dynamic entries which need relocation to temp
	array before relocating.
	(DL_RO_DYN_TEMP_CNT): Define.
	* elf/dl-load.c (_dl_map_object_from_fd): Adjust caller.
	* elf/rtld.c (_dl_start): Likewise.
	(dl_main): Likewise.  Add dyn_temp static variable.
This commit is contained in:
Ulrich Drepper 2003-05-20 22:36:38 +00:00
parent fddfebbd10
commit 479aa8ecb2
4 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -8429,6 +8429,16 @@
(common-mostlyclean, common-clean): Clean up rtld-* files. (common-mostlyclean, common-clean): Clean up rtld-* files.
* sysdeps/unix/make-syscalls.sh: Add rtld-*.os target name to rules. * sysdeps/unix/make-syscalls.sh: Add rtld-*.os target name to rules.
2003-05-20 Jakub Jelinek <jakub@redhat.com>
* elf/dynamic-link.h (elf_get_dynamic_info): Add temp argument.
If temp != NULL, copy dynamic entries which need relocation to temp
array before relocating.
(DL_RO_DYN_TEMP_CNT): Define.
* elf/dl-load.c (_dl_map_object_from_fd): Adjust caller.
* elf/rtld.c (_dl_start): Likewise.
(dl_main): Likewise. Add dyn_temp static variable.
2002-10-11 Roland McGrath <roland@redhat.com> 2002-10-11 Roland McGrath <roland@redhat.com>
* sysdeps/generic/dl-tls.c (__tls_get_addr): After freeing block in * sysdeps/generic/dl-tls.c (__tls_get_addr): After freeing block in

2
elf/dl-load.c
View File

@ -1268,7 +1268,7 @@ cannot allocate TLS data structures for initial thread");
(unsigned long int) l->l_phdr, (unsigned long int) l->l_phdr,
(int) sizeof (void *) * 2, l->l_phnum); (int) sizeof (void *) * 2, l->l_phnum);
elf_get_dynamic_info (l); elf_get_dynamic_info (l, NULL);
/* Make sure we are not dlopen'ing an object /* Make sure we are not dlopen'ing an object
that has the DF_1_NOOPEN flag set. */ that has the DF_1_NOOPEN flag set. */

47
elf/dynamic-link.h
View File

@ -56,7 +56,7 @@ elf_machine_lazy_rel (struct link_map *map,
/* Read the dynamic section at DYN and fill in INFO with indices DT_*. */ /* Read the dynamic section at DYN and fill in INFO with indices DT_*. */
static inline void __attribute__ ((unused, always_inline)) static inline void __attribute__ ((unused, always_inline))
elf_get_dynamic_info (struct link_map *l) elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
{ {
ElfW(Dyn) *dyn = l->l_ld; ElfW(Dyn) *dyn = l->l_ld;
ElfW(Dyn) **info; ElfW(Dyn) **info;
@ -88,32 +88,45 @@ elf_get_dynamic_info (struct link_map *l)
+ DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn; + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++dyn; ++dyn;
} }
#define DL_RO_DYN_TEMP_CNT 8
#ifndef DL_RO_DYN_SECTION #ifndef DL_RO_DYN_SECTION
/* Don't adjust .dynamic unnecessarily. */ /* Don't adjust .dynamic unnecessarily. */
if (l->l_addr != 0) if (l->l_addr != 0)
{ {
ElfW(Addr) l_addr = l->l_addr; ElfW(Addr) l_addr = l->l_addr;
int cnt = 0;
if (info[DT_HASH] != NULL) # define ADJUST_DYN_INFO(tag) \
info[DT_HASH]->d_un.d_ptr += l_addr; do \
if (info[DT_PLTGOT] != NULL) if (info[tag] != NULL) \
info[DT_PLTGOT]->d_un.d_ptr += l_addr; { \
if (info[DT_STRTAB] != NULL) if (temp) \
info[DT_STRTAB]->d_un.d_ptr += l_addr; { \
if (info[DT_SYMTAB] != NULL) temp[cnt].d_tag = info[tag]->d_tag; \
info[DT_SYMTAB]->d_un.d_ptr += l_addr; temp[cnt].d_un.d_ptr = info[tag]->d_un.d_ptr + l_addr; \
info[tag] = temp + cnt++; \
} \
else \
info[tag]->d_un.d_ptr += l_addr; \
} \
while (0)
ADJUST_DYN_INFO (DT_HASH);
ADJUST_DYN_INFO (DT_PLTGOT);
ADJUST_DYN_INFO (DT_STRTAB);
ADJUST_DYN_INFO (DT_SYMTAB);
# if ! ELF_MACHINE_NO_RELA # if ! ELF_MACHINE_NO_RELA
if (info[DT_RELA] != NULL) ADJUST_DYN_INFO (DT_RELA);
info[DT_RELA]->d_un.d_ptr += l_addr;
# endif # endif
# if ! ELF_MACHINE_NO_REL # if ! ELF_MACHINE_NO_REL
if (info[DT_REL] != NULL) ADJUST_DYN_INFO (DT_REL);
info[DT_REL]->d_un.d_ptr += l_addr;
# endif # endif
if (info[DT_JMPREL] != NULL) ADJUST_DYN_INFO (DT_JMPREL);
info[DT_JMPREL]->d_un.d_ptr += l_addr; ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM));
if (info[VERSYMIDX (DT_VERSYM)] != NULL) # undef ADJUST_DYN_INFO
info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr += l_addr; assert (cnt <= DL_RO_DYN_TEMP_CNT);
} }
#endif #endif
if (info[DT_PLTREL] != NULL) if (info[DT_PLTREL] != NULL)

8
elf/rtld.c
View File

@ -317,7 +317,7 @@ _dl_start (void *arg)
/* Read our own dynamic section and fill in the info array. */ /* Read our own dynamic section and fill in the info array. */
bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic (); bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
elf_get_dynamic_info (&bootstrap_map); elf_get_dynamic_info (&bootstrap_map, NULL);
#if defined USE_TLS && NO_TLS_OFFSET != 0 #if defined USE_TLS && NO_TLS_OFFSET != 0
bootstrap_map.l_tls_offset = NO_TLS_OFFSET; bootstrap_map.l_tls_offset = NO_TLS_OFFSET;
@ -892,7 +892,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (! rtld_is_main) if (! rtld_is_main)
{ {
/* Extract the contents of the dynamic section for easy access. */ /* Extract the contents of the dynamic section for easy access. */
elf_get_dynamic_info (GL(dl_loaded)); elf_get_dynamic_info (GL(dl_loaded), NULL);
if (GL(dl_loaded)->l_info[DT_HASH]) if (GL(dl_loaded)->l_info[DT_HASH])
/* Set up our cache of pointers into the hash table. */ /* Set up our cache of pointers into the hash table. */
_dl_setup_hash (GL(dl_loaded)); _dl_setup_hash (GL(dl_loaded));
@ -1083,6 +1083,8 @@ 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); struct link_map *l = _dl_new_object ((char *) "", "", lt_library, NULL);
if (__builtin_expect (l != NULL, 1)) if (__builtin_expect (l != NULL, 1))
{ {
static ElfW(Dyn) dyn_temp [DL_RO_DYN_TEMP_CNT];
l->l_phdr = ((const void *) GL(dl_sysinfo_dso) l->l_phdr = ((const void *) GL(dl_sysinfo_dso)
+ GL(dl_sysinfo_dso)->e_phoff); + GL(dl_sysinfo_dso)->e_phoff);
l->l_phnum = GL(dl_sysinfo_dso)->e_phnum; l->l_phnum = GL(dl_sysinfo_dso)->e_phnum;
@ -1098,7 +1100,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (ph->p_type == PT_LOAD) if (ph->p_type == PT_LOAD)
assert ((void *) ph->p_vaddr == GL(dl_sysinfo_dso)); assert ((void *) ph->p_vaddr == GL(dl_sysinfo_dso));
} }
elf_get_dynamic_info (l); elf_get_dynamic_info (l, dyn_temp);
_dl_setup_hash (l); _dl_setup_hash (l);
l->l_relocated = 1; l->l_relocated = 1;