aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-09-11 09:17:52 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2023-09-16 11:33:46 +0200
commit03940e8389194d69a9029fa19c784ef2c977c914 (patch)
treeeb66805f6a40c8c5b79c879f39972e79d3206fff
parentelf: Remove unused l_text_end field from struct link_map (diff)
downloadglibc-03940e8389194d69a9029fa19c784ef2c977c914.tar.gz
glibc-03940e8389194d69a9029fa19c784ef2c977c914.tar.bz2
glibc-03940e8389194d69a9029fa19c784ef2c977c914.zip
elf: Move l_init_called_next to old place of l_text_end in link map
This preserves all member offsets and the GLIBC_PRIVATE ABI for backporting. (cherry picked from commit 1a7cbe52c8955beae477cf9c6d88f4bc04f626c1)
-rw-r--r--include/link.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/link.h b/include/link.h
index c6af095d87..686813f281 100644
--- a/include/link.h
+++ b/include/link.h
@@ -254,6 +254,10 @@ struct link_map
need not be the same as l_addr. */
ElfW(Addr) l_map_start, l_map_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'. */
@@ -276,10 +280,6 @@ 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
{