From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 30B033858D1E; Thu, 19 Oct 2023 07:20:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 30B033858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1697700050; bh=7khrasWFktgTOUzpgR0xcuxoqgN/VvnJIzxoeXYiVy8=; h=From:To:Subject:Date:From; b=u/A9sUqZU1+w2Jscy5xjgEycz0pUVoMlwUKTn60Ba95LIkva7/CATSQ5wq5JXmJ53 G8w0Gj6gT2KIULe3dHozu7XRRt95JmF8rMxT+2cu6a+3frKeJkKzuDyO+v19rYupj3 XIoMu462SVLUvM35juilwHyoyfe6eUfYbkFgQbaw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.38/master] Revert "elf: Move l_init_called_next to old place of l_text_end in link map" X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.38/master X-Git-Oldrev: 719866ab2ff0e6d514a04fb47e507d92e70ef7ee X-Git-Newrev: 1e04dcec491bd8f48b5b74ce3e8414132578a645 Message-Id: <20231019072050.30B033858D1E@sourceware.org> Date: Thu, 19 Oct 2023 07:20:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1e04dcec491bd8f48b5b74ce3e8414132578a645 commit 1e04dcec491bd8f48b5b74ce3e8414132578a645 Author: Florian Weimer Date: Thu Oct 19 09:17:38 2023 +0200 Revert "elf: Move l_init_called_next to old place of l_text_end in link map" This reverts commit d3ba6c1333b10680ce5900a628108507d9d4b844. Reason: 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 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 {