[glibc/release/2.35/master] Revert "elf: Move l_init_called_next to old place of l_text_end in link map"

[glibc/release/2.35/master] Revert "elf: Move l_init_called_next to old place of l_text_end in link map"

[Florian Weimer]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=01ea8d9dde2e846dd8afe4d82b388796d4ccec6b

commit 01ea8d9dde2e846dd8afe4d82b388796d4ccec6b
Author: Florian Weimer <fweimer@redhat.com>
Date:   Thu Oct 19 09:32:49 2023 +0200

    Revert "elf: Move l_init_called_next to old place of l_text_end in link map"
    
    This reverts commit 59ee83b0c27a67a34dc53b312424c9435423bfc9.
    
    Reason for revert: Preserve internal ABI.

Diff:
---
 include/link.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/link.h b/include/link.h
index 041a518100..efd16a689d 100644
--- a/include/link.h
+++ b/include/link.h
@@ -258,10 +258,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'.  */
@@ -284,6 +280,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
       {