From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6CD893858C41 for ; Mon, 11 Sep 2023 08:06:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6CD893858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694419609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=PZKy3Yd5Y1xIL4wzbsB1nMmAYYcBBjQAJ+CVRvxQuQk=; b=UDATAVOa0z5HIBACzDUaTTSP9Thn9Ypzp/QTl9X9iJsQfrKJ3y5cX884wiBk9XEbns3NZa Siia3Et/SvXTqFY1ICF/rTmSmHM3pSKQ4aOCKjdt1ecvN3oUB91CjYqd8CFTQuYoQr647s +Vj6/V7hZn2X2yi5ipLQicBHvUJeBW8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-142-p0koSgxGMhy0C73iQgEjqg-1; Mon, 11 Sep 2023 04:06:47 -0400 X-MC-Unique: p0koSgxGMhy0C73iQgEjqg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8019B3C1ACD7 for ; Mon, 11 Sep 2023 08:06:47 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 283002027045 for ; Mon, 11 Sep 2023 08:06:47 +0000 (UTC) From: Florian Weimer To: libc-stable@sourceware.org Subject: [PATCH COMMITTED 2.35, 2.36, 2.37, 2.38] elf: Move l_init_called_next to old place of l_text_end in link map Date: Mon, 11 Sep 2023 10:06:45 +0200 Message-ID: <878r9d2kx6.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This preserves all member offsets and the GLIBC_PRIVATE ABI for backporting. --- include/link.h | 8 ++++---- 1 file 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 { base-commit: 750f19526ae71aac801c77a3f7ef5374890c09b7