From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bf57366ccdso4076195ad.1 for ; Wed, 23 Aug 2023 23:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692858179; x=1693462979; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=rdbv2Mo3KOjEJmCc7WWJNyjQQfeH35VwAbW/9cBeTyM=; b=ogS7DB7iaC7v9ijSs6W34rIINOUa6u8e8GwdkgREBx5h2qPRNJmDqp5YmFQYCWr0FX +feZc6NOB9/FQQ3rdZdimXIcPiu1/7b2BvfF0oNRL3ZF2pjr0MEylqIe/AwfuN/1iaAG LVI+4WCVJgcOOD7Wq+9uI011fsrD3j0Q/ukWWVHYjZvRKERy61WHZaSRmsX0JXW4OnCi p1h47nMpN/TzVqGrTGzCdxdDhyAMHwhWs5fMeXwrr77pO8y9HcRvyWrOA2DejeUWPY1R xEnIrhpcbHmV19ez/xTuEP1mibfF3yuvXTkjC1G9eVSL7Z4HTLPZ9Z0lXUchJxdxFlzj 2EmQ== 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-Google-Smtp-Source: AGHT+IEGDLJ2hi0smx/pv4hm7xuiuYt/WGJwtIGGX9sfOby911ZyaUIBzLniw/c3zXUk0q9DjAeHqA== 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 From: Alan Modra To: binutils@sourceware.org Subject: nds32, sh, kvx: DT_JMPREL/DT_PLTRELSZ Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 List-Id: 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: -- Alan Modra Australia Development Lab, IBM