From patchwork Thu Apr 13 05:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 82801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp804649vqo; Wed, 12 Apr 2023 22:40:44 -0700 (PDT) X-Google-Smtp-Source: AKy350aM6JR4XCNn2UoCL3LlOmmTtSq+HgK1bFfzDA/b/fYM91MwHKS7MDCXBWMC7pt1QVxz9ZfZ X-Received: by 2002:a05:6402:202f:b0:504:9cec:8afb with SMTP id ay15-20020a056402202f00b005049cec8afbmr1453845edb.2.1681364444275; Wed, 12 Apr 2023 22:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681364444; cv=none; d=google.com; s=arc-20160816; b=QjI6BfMiYLZ821QDEnzd/MdIGsiYEMpSDmIiU6am0i0uQ0VSmcXcoF756e2vkCsO5K xn8ci8TOwXNoO5p4G61J44dWckVnPB1ZDgInzzII0d2BEP8+4mtI58dl6n6wk31HdK7z b3f5zXNWRYgOCSqxyqObCV/AQ+oHq4po1Z7JbCX35Xx8rRhU+XRFA9B6I4mEviaXwLLV PPWTSgxLDJAN4Gq0ZYnm4WQtrOwYvnZn2F7TBKCh2lGK5vex8CsJKcn1pC/kJVu278Ag WPAwb1JkNqJ3vXVAOBZIb5vHEFrhMTvv7KWkXtJAVBpVwV8UCwRdPOCR6DRM/CKEWUDh JP7w== 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=4xHVo2InjBCq12oSWJH8AodE/Am0+SaMfzMSxwRoAHY=; b=olWauENc5bAS17By58DgjTltRLaaj2a9ZvWKFNBgoHGqf3CBKFbddwMXyEfwyWB89P M5R5ztxk31NtxfYqMjJbq2FF860Lpp/Y2+bDELCRmVPfjdoHqGnD7JAVvs9B78KF9P5G eO0/M5dZBN2HI7gxccBD9I1iWCID3tBOKHXvUd9A3wryzcemyg0NaZMhXjM3vAEc4iJ9 cjHDKENtAZOxOi0vTl3rp9C/mx5iOyr3vRkpIQlQTtGtcsP7fcYNuwEdqR1vRLkGFE3c 1eaYR5L0hQ4jS+CNBqVaE74UkECndgnDQBC+821qjG6VzKyHbBHADNFvyBG9AyDdEYWJ m6rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=n0lDUrO8; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id we9-20020a170907234900b009333dc257b0si872912ejb.350.2023.04.12.22.40.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 22:40:44 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=n0lDUrO8; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 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 3AF7F3858D32 for ; Thu, 13 Apr 2023 05:40:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AF7F3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681364443; bh=4xHVo2InjBCq12oSWJH8AodE/Am0+SaMfzMSxwRoAHY=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=n0lDUrO8HzibBuFfO1K7Kykf540E5wS1UVXpRBP3218Ey/Zylt0HhQLlFtXMmiiBz CIp8rHeS1CzzccoqkKSvSrCpN6RRYM74IPRPsIHDXN76oY9VdcKqrWQJtDTHgVfDFa 7Lpd2NuOMcPOrOUmFHLyB6eLZv/VSNgQGLU9hZwE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@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 7E6DE3858D32 for ; Thu, 13 Apr 2023 05:40:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E6DE3858D32 Received: by mail-pj1-x1031.google.com with SMTP id g3so15298142pja.2 for ; Wed, 12 Apr 2023 22:40:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681364433; x=1683956433; 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=4xHVo2InjBCq12oSWJH8AodE/Am0+SaMfzMSxwRoAHY=; b=YPBywF5KZFZVd1WNPCJ94CbABuxb+B7SfO5NRXVFOo9UJvgnjER4DJDdPSLoO9jykg oFDfqiLpMpMkXtNo7lN2DtQ5AGOkgJIz65U5a3jV3ReWAbza4kGMhsUZrgKIk9FH+xFi r82YNzGGNr3hc5Dxdgp358wC0ssK5QjJUxzryZat42Px95i3KGZ38mdzu8m+IvbKv01A 3ExX4L2lfgj4LGosUCnFVksbVZbPmgfxr/KuP5zkN+WR3QLHpuIQ4Tg3b7YQPAI8oav9 hGPfgLL4Ebu919itx1eUM8YcFOwbAvbGXwPK0hvbPAZMIeuP1tfp4NB8xjuNxSbGYHd3 gf/A== X-Gm-Message-State: AAQBX9elM4Xg7gbsPfFt8ajNvVNczSOf+H0F3VZwNUmH5rQqPP3UxRtf RsrlfAp0Hbgk4jGAlYqrOkKnM/VTdGE= X-Received: by 2002:a05:6a20:a885:b0:ec:60a:d04c with SMTP id ca5-20020a056a20a88500b000ec060ad04cmr910754pzb.28.1681364432950; Wed, 12 Apr 2023 22:40:32 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id bm17-20020a056a00321100b00580e3917af7sm422412pfb.117.2023.04.12.22.40.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 22:40:32 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 0FD7D1142C37; Thu, 13 Apr 2023 15:10:30 +0930 (ACST) Date: Thu, 13 Apr 2023 15:10:30 +0930 To: binutils@sourceware.org Subject: Preserve a few more bfd fields in check_format_matches Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.0 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?1763038403887819844?= X-GMAIL-MSGID: =?utf-8?q?1763038403887819844?= AOUT and COFF targets set symcount and start_address in their object_p functions. If these are used anywhere then it would pay to save and restore them so that a successful match gets the values expected rather than that for a later unsuccessful target match. * format.c (struct bfd_preserve): Move some fields. Add symcount, read_only and start_address. (bfd_preserve_save): Save.. (bfd_preserve_restore): ..and restore.. (bfd_reinit): ..and zero new fields. diff --git a/bfd/format.c b/bfd/format.c index 66b45ae1979..c790f86d202 100644 --- a/bfd/format.c +++ b/bfd/format.c @@ -102,13 +102,16 @@ struct bfd_preserve const struct bfd_iovec *iovec; void *iostream; const struct bfd_arch_info *arch_info; + const struct bfd_build_id *build_id; + bfd_cleanup cleanup; struct bfd_section *sections; struct bfd_section *section_last; unsigned int section_count; unsigned int section_id; + unsigned int symcount; + bool read_only; + bfd_vma start_address; struct bfd_hash_table section_htab; - const struct bfd_build_id *build_id; - bfd_cleanup cleanup; }; /* When testing an object for compatibility with a particular target @@ -133,6 +136,9 @@ bfd_preserve_save (bfd *abfd, struct bfd_preserve *preserve, preserve->section_last = abfd->section_last; preserve->section_count = abfd->section_count; preserve->section_id = _bfd_section_id; + preserve->symcount = abfd->symcount; + preserve->read_only = abfd->read_only; + preserve->start_address = abfd->start_address; preserve->section_htab = abfd->section_htab; preserve->marker = bfd_alloc (abfd, 1); preserve->build_id = abfd->build_id; @@ -183,6 +189,9 @@ bfd_reinit (bfd *abfd, unsigned int section_id, abfd->tdata.any = NULL; abfd->arch_info = &bfd_default_arch_struct; io_reinit (abfd, preserve); + abfd->symcount = 0; + abfd->read_only = 0; + abfd->start_address = 0; abfd->build_id = NULL; bfd_section_list_clear (abfd); } @@ -202,6 +211,9 @@ bfd_preserve_restore (bfd *abfd, struct bfd_preserve *preserve) abfd->section_last = preserve->section_last; abfd->section_count = preserve->section_count; _bfd_section_id = preserve->section_id; + abfd->symcount = preserve->symcount; + abfd->read_only = preserve->read_only; + abfd->start_address = preserve->start_address; abfd->build_id = preserve->build_id; /* bfd_release frees all memory more recently bfd_alloc'd than