From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id B00B8385703A; Mon, 11 Sep 2023 08:04:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B00B8385703A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694419471; bh=vG8pfuLOwtMIzCqMT2i8eFVtaLeu3t/COu0W1qgnz10=; h=From:To:Subject:Date:From; b=Ro0MhkcAHaqq/munEl22CFHh5hctsVUotdmks6k6lPAVm6EozJpUPo1rBSGx2cXJD Ris9atISjtZmt3Z0Ri4j9gpdVwoXfrhgJKG2ZNspEbMBMcFYuWc0k3PWME6yi6vANR fjj5wz9LO1d2hydIRyZLtxqgkvi+PLFlyNx0RaUg= 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.36/master] 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.36/master X-Git-Oldrev: 9f0d3bb2e325dc30ae20e347cccbe10fa0b4ce9b X-Git-Newrev: f441cb9a70fa3f55e9bbd615924879d692d21a6c Message-Id: <20230911080431.B00B8385703A@sourceware.org> Date: Mon, 11 Sep 2023 08:04:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f441cb9a70fa3f55e9bbd615924879d692d21a6c commit f441cb9a70fa3f55e9bbd615924879d692d21a6c Author: Florian Weimer Date: Mon Sep 11 09:17:52 2023 +0200 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. Diff: --- include/link.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/link.h b/include/link.h index 81f5715db0..4eb8fe0d96 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 {