diff options
| author | Florian Weimer <fweimer@redhat.com> | 2023-09-08 13:02:06 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2023-09-08 18:39:20 +0200 |
| commit | 53df2ce6885da3d0e89e87dca7b095622296014f (patch) | |
| tree | 6b7db1b4af022e0eb002f92e5891055f230d47f3 /elf/setup-vdso.h | |
| parent | 6985865bc3ad5b23147ee73466583dd7fdf65892 (diff) | |
| download | glibc-53df2ce6885da3d0e89e87dca7b095622296014f.tar.gz glibc-53df2ce6885da3d0e89e87dca7b095622296014f.tar.xz glibc-53df2ce6885da3d0e89e87dca7b095622296014f.zip | |
elf: Remove unused l_text_end field from struct link_map
It is a left-over from commit 52a01100ad011293197637e42b5be1a479a2
("elf: Remove ad-hoc restrictions on dlopen callers [BZ #22787]").
When backporting commmit 6985865bc3ad5b23147ee73466583dd7fdf65892
("elf: Always call destructors in reverse constructor order
(bug 30785)"), we can move the l_init_called_next field to this
place, so that the internal GLIBC_PRIVATE ABI does not change.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'elf/setup-vdso.h')
| -rw-r--r-- | elf/setup-vdso.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h index 0079842d1f..d92b12a7aa 100644 --- a/elf/setup-vdso.h +++ b/elf/setup-vdso.h @@ -51,9 +51,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), l->l_addr = ph->p_vaddr; if (ph->p_vaddr + ph->p_memsz >= l->l_map_end) l->l_map_end = ph->p_vaddr + ph->p_memsz; - if ((ph->p_flags & PF_X) - && ph->p_vaddr + ph->p_memsz >= l->l_text_end) - l->l_text_end = ph->p_vaddr + ph->p_memsz; } else /* There must be no TLS segment. */ @@ -62,7 +59,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), l->l_map_start = (ElfW(Addr)) GLRO(dl_sysinfo_dso); l->l_addr = l->l_map_start - l->l_addr; l->l_map_end += l->l_addr; - l->l_text_end += l->l_addr; l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr); elf_get_dynamic_info (l, false, false); _dl_setup_hash (l); |