aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-10-19 09:21:12 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2023-10-26 22:41:35 +0200
commit2e587c86c8bef3f9430d176da93eaee26f928b83 (patch)
treef6f89dfa2fea3743d6c06464542ea6e83288ae9e
parentRevert "elf: Always call destructors in reverse constructor order (bug 30785)" (diff)
downloadglibc-2e587c86c8bef3f9430d176da93eaee26f928b83.tar.gz
glibc-2e587c86c8bef3f9430d176da93eaee26f928b83.tar.bz2
glibc-2e587c86c8bef3f9430d176da93eaee26f928b83.zip
Revert "elf: Move l_init_called_next to old place of l_text_end in link map"
This reverts commit 1a7cbe52c8955beae477cf9c6d88f4bc04f626c1. Reason for revert: Preserve internal ABI. (cherry picked from commit 8e20aedfd7fc77b630109a2bcde94e6c95dbcc3d)
-rw-r--r--include/link.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/link.h b/include/link.h
index a02d5f2eba..69bda3ed17 100644
--- a/include/link.h
+++ b/include/link.h
@@ -256,10 +256,6 @@ struct link_map
/* End of the executable part of the mapping. */
ElfW(Addr) l_text_end;
- /* Linked list of objects in reverse ELF constructor execution
- order. Head of list is stored in _dl_init_called_list. */
- struct link_map *l_init_called_next;
-
/* Default array for 'l_scope'. */
struct r_scope_elem *l_scope_mem[4];
/* Size of array allocated for 'l_scope'. */
@@ -282,6 +278,10 @@ struct link_map
/* List of object in order of the init and fini calls. */
struct link_map **l_initfini;
+ /* Linked list of objects in reverse ELF constructor execution
+ order. Head of list is stored in _dl_init_called_list. */
+ struct link_map *l_init_called_next;
+
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
{