From patchwork Sat Jan 8 18:38:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 49754 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1DC63865C30 for ; Sat, 8 Jan 2022 18:43:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1DC63865C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641667399; bh=Shha5XO9Qq5yWLD6GKRmXLdQ7jhGbuheO+D1g8Sl3dM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kAuKXJMoncB1gyTgjr36ya1hwRHmsDlcFN8XZBa4bpnJ5Pq5wMOJge2Kug3fJIc7l /oLG0kDMEySlyYdxw1WY4ZHLLS9SUo695Kp0XYPOdVQxNcNmtgxXnweJuc7rRGAZDu tr4ag2neBVm4P38uNxdg0qNNyHW6B0oQd0w9ubbk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id C4D8B386EC36; Sat, 8 Jan 2022 18:38:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C4D8B386EC36 Received: by mail-pj1-x1031.google.com with SMTP id 59-20020a17090a09c100b001b34a13745eso9361320pjo.5; Sat, 08 Jan 2022 10:38:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Shha5XO9Qq5yWLD6GKRmXLdQ7jhGbuheO+D1g8Sl3dM=; b=m+B9uMWQq54FbeMeFCJhlpxRK29wjxlXUanisNxUiP05fbHQBjK4pxq+yAjB69c6Hu eCmT0JRVlb92yBCuMo/0S+O0m9dJXjcA7979wN2XB/JatnCT0hwxUbMm8C0krHhq6naY XUjA5C+SuBO35V5fCaQjfUmvFB3odo4a5wIYRQPLgGO0J69O/3v/cb99CAHyiLJH+4ay bySeXQIuZ9c3eNaDmj8lU4oylRAjDDBcE+Z/xVzn0Vx9QebQ9D3NTSIEo6W1MyRFn+oy 3Ildp5yTVHyr/3MfwAcAxCx6gFJOmYl3SmfovA1DrfCPBzlnYRQOZPpaqazYm/VMrNx0 TEag== X-Gm-Message-State: AOAM533k6gpqMN4CPjmex0O359DdBkANt6Q27Nb+jmFAFL8uIcYdO4QV ktDE7Rthc4bxX+2HXmLN+xmKI/k1lHY= X-Google-Smtp-Source: ABdhPJxA2mNlREfi7paktyF4RcTrVPRE4oPYqdsE57rtQE7BXRws/igNibEdZ5NdzZLeOmR3W/m9nA== X-Received: by 2002:a17:90b:1e07:: with SMTP id pg7mr21856998pjb.109.1641667120813; Sat, 08 Jan 2022 10:38:40 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id t25sm2043116pgv.9.2022.01.08.10.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jan 2022 10:38:40 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 202DFC0DB6; Sat, 8 Jan 2022 10:38:39 -0800 (PST) To: binutils@sourceware.org Subject: [PATCH v2 3/9] elf: Pass need_layout to _bfd_elf_map_sections_to_segments Date: Sat, 8 Jan 2022 10:38:32 -0800 Message-Id: <20220108183838.1920397-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220108183838.1920397-1-hjl.tools@gmail.com> References: <20220108183838.1920397-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3028.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: libc-alpha@sourceware.org, Nick Clifton , Alan Modra Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" On some targets, the DT_RELR section size can be computed only after all symbols addresses can be determined. Update ldelf_map_segments to pass need_layout to _bfd_elf_map_sections_to_segments which will size DT_RELR section and set need_layout to true if the DT_RELR section size is changed. bfd/ * elf-bfd.h (_bfd_elf_map_sections_to_segments): Add a bool pointer argument. * elf.c (_bfd_elf_map_sections_to_segments): Add a bool pointer argument to indicate if section layout needs update. (assign_file_positions_for_load_sections): Pass NULL to _bfd_elf_map_sections_to_segments. * elflink.c (_bfd_elf_strip_zero_sized_dynamic_sections): Pass NULL to _bfd_elf_map_sections_to_segments. ld/ * ldelfgen.c (ldelf_map_segments): Pass &need_layout to _bfd_elf_map_sections_to_segments. --- bfd/elf-bfd.h | 2 +- bfd/elf.c | 9 ++++++--- bfd/elflink.c | 3 ++- ld/ldelfgen.c | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 2441b3c0cd7..c4d2ef00d6b 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -2718,7 +2718,7 @@ extern struct elf_segment_map * _bfd_elf_make_dynamic_segment (bfd *, asection *); extern bool _bfd_elf_map_sections_to_segments - (bfd *, struct bfd_link_info *); + (bfd *, struct bfd_link_info *, bool *); extern bool _bfd_elf_is_function_type (unsigned int); diff --git a/bfd/elf.c b/bfd/elf.c index ef0d18105ba..8b866b63e18 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4609,10 +4609,13 @@ elf_modify_segment_map (bfd *abfd, #define IS_TBSS(s) \ ((s->flags & (SEC_THREAD_LOCAL | SEC_LOAD)) == SEC_THREAD_LOCAL) -/* Set up a mapping from BFD sections to program segments. */ +/* Set up a mapping from BFD sections to program segments. Update + NEED_LAYOUT if the section layout is changed. */ bool -_bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) +_bfd_elf_map_sections_to_segments (bfd *abfd, + struct bfd_link_info *info, + bool *need_layout ATTRIBUTE_UNUSED) { unsigned int count; struct elf_segment_map *m; @@ -5416,7 +5419,7 @@ assign_file_positions_for_load_sections (bfd *abfd, unsigned int opb = bfd_octets_per_byte (abfd, NULL); if (link_info == NULL - && !_bfd_elf_map_sections_to_segments (abfd, link_info)) + && !_bfd_elf_map_sections_to_segments (abfd, link_info, NULL)) return false; alloc = 0; diff --git a/bfd/elflink.c b/bfd/elflink.c index 29ef9ddf8b9..bea413ec24e 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3676,7 +3676,8 @@ _bfd_elf_strip_zero_sized_dynamic_sections (struct bfd_link_info *info) { /* Regenerate program headers. */ elf_seg_map (info->output_bfd) = NULL; - return _bfd_elf_map_sections_to_segments (info->output_bfd, info); + return _bfd_elf_map_sections_to_segments (info->output_bfd, info, + NULL); } return true; diff --git a/ld/ldelfgen.c b/ld/ldelfgen.c index 5c033bbfbe0..58b37c65bc9 100644 --- a/ld/ldelfgen.c +++ b/ld/ldelfgen.c @@ -304,7 +304,8 @@ ldelf_map_segments (bool need_layout) if (lang_phdr_list == NULL) elf_seg_map (link_info.output_bfd) = NULL; if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd, - &link_info)) + &link_info, + &need_layout)) einfo (_("%F%P: map sections to segments failed: %E\n")); if (phdr_size != elf_program_header_size (link_info.output_bfd))