From patchwork Thu Aug 24 06:22:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 136758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp920218vqm; Wed, 23 Aug 2023 23:23:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0gNofpjNYTzWNwNivwgLzg+MdoPIgyV1kMas0AyJQBVos2HU/EENsTDv7CP0g1eBC5pgd X-Received: by 2002:a05:6402:343:b0:523:100b:70da with SMTP id r3-20020a056402034300b00523100b70damr17433125edw.4.1692858191285; Wed, 23 Aug 2023 23:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692858191; cv=none; d=google.com; s=arc-20160816; b=HXLLHwsGWGI9yVfo0UiTR0iBMjM+NgNlrfyXy77T1o3Sl6b6rtHz9jqL+DpdT8UW1c aiPXT3tao4bLZmXZWJxE+XpEA2Men7HQYq2rCKuUVKBGI7LZqmAOMQIXmy4fyiJHsa/2 z010qFKg3oNpqiTaeHLtBZ9xqsW2GTpxBsNtwFOf6gngkA25V8FuK3+17VHxdyXmDABh U7ajR99cAMtsoADOpI51n3dkhOvbSMLptw7uwa/1CmDPOnhlh8sX33ew//vDeyLG53bq NYVYaNwyaAlMVntEXEOM7QQr6ac5sc1/Pg1s8TK+mhK3t6wqcTLH3kakIVJcOx6pfKbM OVYQ== 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=rdbv2Mo3KOjEJmCc7WWJNyjQQfeH35VwAbW/9cBeTyM=; fh=HNIqzTA9Dp00ovCAyCdXfuEvWDT00OlFxFRPLybXRis=; b=yw+8EXYobJ31UW0loDlEB7ojTcmjv+W+4gzrpeH9QtfCR47C2DhVCBCU+xdpMFpqOK oYG/a24+qQ8NMQQcB1vYCZqeXwu4z1iKz7iEqSvifno2HFKR+4nHh/cnn9/vaCdyh9ZO GZ2e+HvxJX7rp//gjgt5SpkvsD3nwOqu8U5uSFr2BWEjUt1zDoYMAGMRhF19CwotESNJ dk8RvS69cD6SRJf6fS1qKh9t0nztdKtAnxcZEZGfHw95hGB7CNxhxVUlBTS0cEQomkYw TmuRjJihpjQ1NIQfJFJSFMbmZ2cumOuF8kw15VkDb45ytd42K8WcZ5d+X+crTZTll2pO 4CEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WTLbYzoC; 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d15-20020aa7d68f000000b005257da7af12si9523468edr.321.2023.08.23.23.23.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 23:23:11 -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=WTLbYzoC; 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 F3A933858401 for ; Thu, 24 Aug 2023 06:23:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3A933858401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692858190; bh=rdbv2Mo3KOjEJmCc7WWJNyjQQfeH35VwAbW/9cBeTyM=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WTLbYzoCEtnmZ6LyW98QGAk8hONCcUpRjGSTNXptID4GkU0to6h6obSOhzYIb/wcT 1Kkp/ePiUsop/fxQIt+bU1AgnHrW0keQCWE3X80UwqCfuuS8qo44r71hb4+gFiQhL8 gO+H7jjTkareAxHErQ4ggWQlXrJyo85UwCaTG4oU= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id B8D3B3858422 for ; Thu, 24 Aug 2023 06:23:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B8D3B3858422 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bf57366ccdso4076195ad.1 for ; Wed, 23 Aug 2023 23:23:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692858179; x=1693462979; 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=rdbv2Mo3KOjEJmCc7WWJNyjQQfeH35VwAbW/9cBeTyM=; b=YCiACXDln2LLiMtGGvCD0g2MAxz2M74PtCkI9NAzOZ+69/jnkoGwvHdoAJhtPycWSS PTpZbycWTcJHProbHu41QoplwZXCzR+R1n2Exzc2P0wcEVxq0voetV2kzagKpMupMBU+ kx6/QjT7yrtSu+47dPMrdEd/Z7z4K3zeTMNrlA5VKuDdphNco2s9jEzF5JeNagR4KFEG F8r3HMiunxGNtgi+rFsJWJhCq45A3meR/T4tSN1AifzCsZL5AAXN/aj/zDGfBW8qkRe3 Bdm0uLtQYCJSycnLzAsPEOO9f797Jlr9/q5wnQ6nMSIyLChSTSfYSMwKrKuVHqGNK11M Xs6g== X-Gm-Message-State: AOJu0Yzcc4HgRNbSLeV1WskiJ8sltBvNIYWyi0jzvck2qsxTA0NBedLQ 3MSbA1wNDkBkGQhPw8A6Pgo5iW8fhWw= X-Received: by 2002:a17:902:cec9:b0:1bb:85cd:9190 with SMTP id d9-20020a170902cec900b001bb85cd9190mr23667298plg.18.1692858179277; Wed, 23 Aug 2023 23:22:59 -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 i11-20020a170902eb4b00b001bdcd965d3csm11926243pli.92.2023.08.23.23.22.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 23:22:58 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 6379A1142BF4; Thu, 24 Aug 2023 15:52:56 +0930 (ACST) Date: Thu, 24 Aug 2023 15:52:56 +0930 To: binutils@sourceware.org Subject: nds32, sh, kvx: DT_JMPREL/DT_PLTRELSZ Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.2 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: INBOX X-GMAIL-THRID: 1775090470451081953 X-GMAIL-MSGID: 1775090470451081953 As commit fa4f2d46f9 did for x86, there a few other targets that wrongly use the output section rather than the dynamic section for DT_JMPREL and others. * elfnn-kvx.c (elfNN_kvx_finish_dynamic_sections): Use input section for DT_JMPREL. * elf32-sh.c (sh_elf_finish_dynamic_sections): Use input section for DT_JMPREL and DT_PLTRELSZ. * elf32-nds32.c (nds32_elf_finish_dynamic_sections): Likewise, and for DT_PLTGOT and when adjusting DT_RELA. diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index f8e24cbc6ef..ac9106a55d4 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -6385,18 +6385,18 @@ nds32_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) case DT_PLTGOT: /* name = ".got"; */ - s = ehtab->sgot->output_section; + s = ehtab->sgot; goto get_vma; case DT_JMPREL: - s = ehtab->srelplt->output_section; + s = ehtab->srelplt; get_vma: BFD_ASSERT (s != NULL); - dyn.d_un.d_ptr = s->vma; + dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; case DT_PLTRELSZ: - s = ehtab->srelplt->output_section; + s = ehtab->srelplt; BFD_ASSERT (s != NULL); dyn.d_un.d_val = s->size; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); @@ -6414,7 +6414,7 @@ nds32_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) about changing the DT_RELA entry. */ if (ehtab->srelplt != NULL) { - s = ehtab->srelplt->output_section; + s = ehtab->srelplt; dyn.d_un.d_val -= s->size; } bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index cba3529e2a5..817efb58454 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -6291,15 +6291,13 @@ sh_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) break; case DT_JMPREL: - s = htab->root.srelplt->output_section; - BFD_ASSERT (s != NULL); - dyn.d_un.d_ptr = s->vma; + s = htab->root.srelplt; + dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; case DT_PLTRELSZ: - s = htab->root.srelplt->output_section; - BFD_ASSERT (s != NULL); + s = htab->root.srelplt; dyn.d_un.d_val = s->size; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; diff --git a/bfd/elfnn-kvx.c b/bfd/elfnn-kvx.c index 95580d19930..2dc6ae603ac 100644 --- a/bfd/elfnn-kvx.c +++ b/bfd/elfnn-kvx.c @@ -4589,7 +4589,8 @@ elfNN_kvx_finish_dynamic_sections (bfd *output_bfd, break; case DT_JMPREL: - dyn.d_un.d_ptr = htab->root.srelplt->output_section->vma; + s = htab->root.srelplt; + dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; break; case DT_PLTRELSZ: