From patchwork Sun Mar 19 11:52:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 71752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp688954wrt; Sun, 19 Mar 2023 04:52:39 -0700 (PDT) X-Google-Smtp-Source: AK7set+yYPLE76Oh19rMdkstnswyLi0ZolHaYVH4HHdlaKX4EQ0fLVBzn19EEDGa4iAaZTIbx74s X-Received: by 2002:a05:6402:1004:b0:4a0:e31a:434 with SMTP id c4-20020a056402100400b004a0e31a0434mr8904804edu.27.1679226759459; Sun, 19 Mar 2023 04:52:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679226759; cv=none; d=google.com; s=arc-20160816; b=cZfjBcoAKnd1CPsFFpvesFMFJoWARqZVP4mvlut0ERRlRbIXZbDF8MGq3okDmHKrOe PRn2q3qmxaaoq3Qrjc8EC7poBGFtMATmVmofjItF6DH+CikLG9S1TPWn0ooNEFUBE86u fDNhAYQZYoz/+HiCGza0iTgtyWXdCaWTJIlL+nKsBLOdhtWrSqd/2dgkAQEk7hvVc2GG HuCp1RZICxnL304KacoxmXXHxpgNiCoAZWnp8C8ft/cxI0m+Cx+YtiGVYmTiaIvgGsLu vhs+/hbRShJRxj9Q5TQSVAgZMTVwDzc/9N89O6LpNRTWKxwFUKukMeGr/EMCN5t6g3Ax EDkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=WfN5Wna6hd+X9Np/7MwyWMy2QlHbDgToP12Qiq3NE1U=; b=vkkHVzIM/BOCV7FTb58usWogLa0V81brkHx68hQCbHk2ubutUKPDm64jXUnrHUxcV8 kTJYc8wZ9koGTrT4ybTvYL1uZ0HrJjjFDo4qkqnfyiihjtJM6W3u2m+DSkFSzgnbqo4C NQu4KTJUWH9UTjHdvik0+akobEeOofXUun4m6F4zwxMflLooM5Q+HqMAX2ZlZMuD43g0 0al3628TzSlh9b61b1nT64tJ7rE91V2HU/oL2libRo1K3dXxumI6zG6QYGcajRwxutkC bn0w+D2Jus0QJpXMTQdkedKaFygMLQDmKY0HaERV0tGHXSXg42PnYTXgFqVHnqi1ksDP pE0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=oFKreNn4; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id z25-20020aa7cf99000000b004beb39bf058si7642388edx.83.2023.03.19.04.52.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 04:52:39 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=oFKreNn4; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E24113858C2B for ; Sun, 19 Mar 2023 11:52:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E24113858C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679226756; bh=WfN5Wna6hd+X9Np/7MwyWMy2QlHbDgToP12Qiq3NE1U=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oFKreNn4z29En18hyyPA5sGz9jix3f/lshdgZeE1qt5so3NqUhg4vRrDKNKm9O/p3 xTmurf7Q0PR/GrxfbZQBY/LIIwbtl+/BNsUGx849phoiOi6iE6EwIDFArDPifZ1qVe U9dUkMJ4aUHA4/TI1j12s77U+uO3KObdv2d43M2Q= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by sourceware.org (Postfix) with ESMTPS id 447CE3858291 for ; Sun, 19 Mar 2023 11:52:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 447CE3858291 Received: by mail-pj1-x1030.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so9694144pjz.1 for ; Sun, 19 Mar 2023 04:52:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679226748; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WfN5Wna6hd+X9Np/7MwyWMy2QlHbDgToP12Qiq3NE1U=; b=g6mOiGI91Msjoz4NARHWdf9SOcDHCPJ8eC+ow2onYPuS+bFsK2zNbF9aZSthdf1vhr qRGKenDw+2V3pmbPY0UHUFXMNEeEBymAu+sohLo67PfQDdfMH5OEWyZl7FFYhTb8M3Yc qBogn56EysYZgbvDRRJloSerk57ojk/6bxTbMre2KAOZE6qIG3ojF+AH1yKwscSj9u2b qGmEzHBQ5gm6AnG+RzddTRbF6NPl5oBp1zECx/FCvSYOuNSP8HsNtT5UAgSZaSBDoBo8 t6lq2uLtsUTczU5BV8EpaylyYP48s3lk5D835pS7Km9hI4XjzG81LnP+DLz5sOrZiOc1 mD6g== X-Gm-Message-State: AO0yUKXPYnDJPomLKF4JVZYBELaDtV/y+dBUwu/L/AQ3n0iF7SEtyzTm FUYFStnaalt1Fw+IGR12MMT5QSG0ow0= X-Received: by 2002:a05:6a20:3b9f:b0:d9:2cef:949f with SMTP id b31-20020a056a203b9f00b000d92cef949fmr1706341pzh.40.1679226748078; Sun, 19 Mar 2023 04:52:28 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:5f2b:8556:6720:fff5]) by smtp.gmail.com with ESMTPSA id g11-20020a62e30b000000b005ac419804d5sm4624917pfh.98.2023.03.19.04.52.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 04:52:27 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 700341142CE7; Sun, 19 Mar 2023 22:22:25 +1030 (ACDT) Date: Sun, 19 Mar 2023 22:22:25 +1030 To: binutils@sourceware.org Subject: rewrite_elf_program_header and want_p_paddr_set_to_zero Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760796878462860840?= X-GMAIL-MSGID: =?utf-8?q?1760796878462860840?= Layout in rewrite_elf_program_header is really done by lma, even if program headers are going to have their p_paddr forced to zero. Thus when not matching against an existing segment, don't try to use a "vma" from elf_segment_map. * elf.c (is_contained_by): Replace "bed" param with "use_vaddr". (IS_SECTION_IN_INPUT_SEGMENT): Adjust is_contained_by call. (rewrite_elf_program_header): Always match against lma in calls to is_contained_by using new maps. diff --git a/bfd/elf.c b/bfd/elf.c index 5c3b3c0eff4..c9abc2579e5 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -6893,14 +6893,14 @@ section_size (asection *section, Elf_Internal_Phdr *segment) /* Returns TRUE if the given section is contained within the given segment. LMA addresses are compared against PADDR when - bed->want_p_paddr_set_to_zero is false, VMA against VADDR when true. */ + USE_VADDR is false, VMA against VADDR when true. */ static bool is_contained_by (asection *section, Elf_Internal_Phdr *segment, bfd_vma paddr, bfd_vma vaddr, unsigned int opb, - const struct elf_backend_data *bed) + bool use_vaddr) { - bfd_vma seg_addr = !bed->want_p_paddr_set_to_zero ? paddr : vaddr; - bfd_vma addr = !bed->want_p_paddr_set_to_zero ? section->lma : section->vma; + bfd_vma seg_addr = !use_vaddr ? paddr : vaddr; + bfd_vma addr = !use_vaddr ? section->lma : section->vma; bfd_vma octet; if (_bfd_mul_overflow (addr, opb, &octet)) return false; @@ -6982,7 +6982,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize) (with the possible exception of .dynamic). */ #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed, opb) \ (((is_contained_by (section, segment, segment->p_paddr, \ - segment->p_vaddr, opb, bed) \ + segment->p_vaddr, opb, \ + bed->want_p_paddr_set_to_zero) \ && (section->flags & SEC_ALLOC) != 0) \ || is_note (section, segment)) \ && segment->p_type != PT_GNU_STACK \ @@ -7309,7 +7310,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize) /* Match up the physical address of the segment with the LMA address of the output section. */ if (is_contained_by (output_section, segment, map->p_paddr, - map->p_paddr + map->p_vaddr_offset, opb, bed) + 0, opb, false) || is_note (section, segment)) { if (matching_lma == NULL @@ -7427,7 +7428,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize) BFD_ASSERT (output_section != NULL); if (is_contained_by (output_section, segment, map->p_paddr, - map->p_paddr + map->p_vaddr_offset, opb, bed) + 0, opb, false) || is_note (section, segment)) { if (map->count == 0)