From patchwork Thu Aug 31 17:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatsuyuki Ishi X-Patchwork-Id: 137324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c792:0:b0:3f2:4152:657d with SMTP id b18csp384492vqu; Thu, 31 Aug 2023 10:16:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVniYX5NLsYZuD1ayF9SneuKN0VvJnJ/K+PMDm8qTaos0HItgvFR5Akvd4HOQh/d9neSO0 X-Received: by 2002:aa7:c95a:0:b0:52a:841:bc58 with SMTP id h26-20020aa7c95a000000b0052a0841bc58mr126638edt.30.1693502185019; Thu, 31 Aug 2023 10:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693502185; cv=none; d=google.com; s=arc-20160816; b=fgs5UyfZDERrkiCJUi0Q/ftMC46iimbh6IAXRA7N7wyoD+4E1r7fRVTjx0HVQfWVkV vGGwnYiloYuoTHopsNVff0gd1BVsCPwH8zfTjIF0CafXhyvrEZMxknQKrH1Qkg/NnsYJ GaA8ebzgBB01St8MNCij8x9gRTySdffh7pNs5uOZytuuux6YPQsM0pbEvFQZgmOeJFUo 6k3IGO0LMeHrvOWrxUxh1GTuq+icVeBfrhZ8p/Uy/uzhEl84YpBTJ7hLz/BBMUZs5sYJ nOYVvxC/p7j89mbjH4wW0Vy03w2+3Viu3zA2bzJWY05BLelkPJnJOx51NRaadgiEgAU2 zITw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=KN+QN6M3KrqHG3eBVvdBKF2VYCLMTklLf+5TnZxcZHg=; fh=daQvw8iO4pGm+Xx4NLO3E4+0gdDDq/ixoODeemdNLuQ=; b=rNq07GSpOuBv7zY0aM6fB7CmZ17lk1PKspmTm0sVAEFhHS6R8udS0MWQqMkF3RzsAh hGxhH7KzjiNhOPNnnXGh8Wfep0I4AIFGl95HbNZSaCJbzDscGMgP3bGtq1nD0q4255ZI iDMmEOOza4h9x3NlJ4FyWCUK3D8Fn/xuJ3TbtjqFRIrFhBsAgpKtKxZNo8vwWdYlvz6U Ut2Og6aObh//Nb2xUWLN4h6wbah0okSMJuXwvv88/kBvkkIngSl/+2KNGL7vSOK/19Gh JJUawchJKFvoJPKQ9JtUjXZMmlGqWEg5za1ME0nq+bMhngnYyRbtJB3Fmivwo4TF+Ulu zcNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=NkeluSQo; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y22-20020aa7d516000000b005294457cc0dsi1254423edq.588.2023.08.31.10.16.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 10:16:25 -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=NkeluSQo; 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 942683856241 for ; Thu, 31 Aug 2023 17:15:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 942683856241 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693502136; bh=KN+QN6M3KrqHG3eBVvdBKF2VYCLMTklLf+5TnZxcZHg=; 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=NkeluSQog5DvEKXePEH9MtXn5Sws8AicuTlHneCluq1+ZdU8yJzPDnZxmung3GqE/ UHKKD/0LhiYxSKLDSydy/ieJlm8VW7cKAIUhBlRJKRCK430vA9J2i1g4yAgjpDiNKU hdlgqGg3ywtNNrKrCH4hQKhU1I2eOc+cM2R62nys= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 7052C385842A for ; Thu, 31 Aug 2023 17:14:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7052C385842A Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-68a56ed12c0so239950b3a.0 for ; Thu, 31 Aug 2023 10:14:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693502040; x=1694106840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KN+QN6M3KrqHG3eBVvdBKF2VYCLMTklLf+5TnZxcZHg=; b=iTHbAUEmSuKvNSfqDHrLfl1lySdzRsPrya+SFioqX0joSrxHK8W3jH6mDVrad8OBBh Xe8rVrX8Guwj7ZrmofeKhgCK2vidAhBzrmpCVmJET/7dAMbOOLfY+XzHAioL0GEqqBRo 13+5h4j/MHbtaZVrBXYZT1nkSgxtniUU8TXyPnVqZp+KXrchvACmlFcVxP1kbUn+Z0QC 37TiV4Mg8iyoGFnSiTxyE7nk+J5F8ndqsClq9Rv5Mi65TgGknAm/eF61LvJCcnbSlb5T 02c8iMupvGzKlHWKTAvcpLjQeuNjs57gkUO3q/Ou6mTd0oUMb6nGgc00mqbo+pwb/XvJ x8LA== X-Gm-Message-State: AOJu0YzRWO3waJ+HowgKfVlF64MSoD4qdgV/pneUilb2aFTA7DP79C4B 1/p4R185Ej/8B4t5e9JP9lzGPD3A7MJsC62E X-Received: by 2002:a05:6a20:7d97:b0:145:3bd9:1377 with SMTP id v23-20020a056a207d9700b001453bd91377mr419228pzj.5.1693502039940; Thu, 31 Aug 2023 10:13:59 -0700 (PDT) Received: from localhost (zz20184013906F627101.userreverse.dion.ne.jp. [111.98.113.1]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0063f0068cf6csm1536462pff.198.2023.08.31.10.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 10:13:59 -0700 (PDT) To: binutils@sourceware.org Subject: [PATCH v2 4/5] RISC-V: Define and use GOT entry size constants for TLS. Date: Fri, 1 Sep 2023 02:13:34 +0900 Message-ID: <20230831171345.49052-5-ishitatsuyuki@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230831171345.49052-1-ishitatsuyuki@gmail.com> References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> <20230831171345.49052-1-ishitatsuyuki@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tatsuyuki Ishi via Binutils From: Tatsuyuki Ishi Reply-To: Tatsuyuki Ishi Cc: Tatsuyuki Ishi , rui314@gmail.com, ruiu@bluewhale.systems Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774500850174321211 X-GMAIL-MSGID: 1775765747617094308 As the size calculation is split by global and local symbols, using a shared constant definition for its size improves clarity. bfd/ * elfnn-riscv.c: Add macros for sizes of a normal GOT entry, TLS GD and TLS IE entry. (allocate_dynrelocs): Replace GOT size expressions with the new constants. (riscv_elf_size_dynamic_sections): Likewise. (riscv_elf_relocate_section): Likewise. --- bfd/elfnn-riscv.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 02b46835cc7..38883134828 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -301,6 +301,8 @@ riscv_is_insn_reloc (const reloc_howto_type *howto) #define PLT_HEADER_SIZE (PLT_HEADER_INSNS * 4) #define PLT_ENTRY_SIZE (PLT_ENTRY_INSNS * 4) #define GOT_ENTRY_SIZE RISCV_ELF_WORD_BYTES +#define TLS_GD_GOT_ENTRY_SIZE (RISCV_ELF_WORD_BYTES * 2) +#define TLS_IE_GOT_ENTRY_SIZE RISCV_ELF_WORD_BYTES /* Reserve two entries of GOTPLT for ld.so, one is used for PLT resolver, the other is used for link map. Other targets also reserve one more entry used for runtime profile? */ @@ -1323,7 +1325,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) /* TLS_GD needs two dynamic relocs and two GOT slots. */ if (tls_type & GOT_TLS_GD) { - s->size += 2 * RISCV_ELF_WORD_BYTES; + s->size += TLS_GD_GOT_ENTRY_SIZE; if (need_reloc) htab->elf.srelgot->size += 2 * sizeof (ElfNN_External_Rela); } @@ -1331,14 +1333,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) /* TLS_IE needs one dynamic reloc and one GOT slot. */ if (tls_type & GOT_TLS_IE) { - s->size += RISCV_ELF_WORD_BYTES; + s->size += TLS_IE_GOT_ENTRY_SIZE; if (need_reloc) htab->elf.srelgot->size += sizeof (ElfNN_External_Rela); } } else { - s->size += RISCV_ELF_WORD_BYTES; + s->size += GOT_ENTRY_SIZE; if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h) && ! UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)) htab->elf.srelgot->size += sizeof (ElfNN_External_Rela); @@ -1566,20 +1568,20 @@ riscv_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) { if (*local_tls_type & GOT_TLS_GD) { - s->size += 2 * RISCV_ELF_WORD_BYTES; + s->size += TLS_GD_GOT_ENTRY_SIZE; if (bfd_link_dll (info)) srel->size += sizeof (ElfNN_External_Rela); } if (*local_tls_type & GOT_TLS_IE) { - s->size += RISCV_ELF_WORD_BYTES; + s->size += TLS_IE_GOT_ENTRY_SIZE; if (bfd_link_dll (info)) srel->size += sizeof (ElfNN_External_Rela); } } else { - s->size += RISCV_ELF_WORD_BYTES; + s->size += GOT_ENTRY_SIZE; if (bfd_link_pic (info)) srel->size += sizeof (ElfNN_External_Rela); } @@ -2905,7 +2907,7 @@ riscv_elf_relocate_section (bfd *output_bfd, reference's GOT slot follows the GD reference's slots. */ ie_off = 0; if ((tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_IE)) - ie_off = 2 * GOT_ENTRY_SIZE; + ie_off = TLS_GD_GOT_ENTRY_SIZE; if ((off & 1) != 0) off &= ~1;