From patchwork Tue Nov 28 08:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatsuyuki Ishi X-Patchwork-Id: 170736 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3854290vqx; Tue, 28 Nov 2023 03:50:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6zT8iOP4Gc2E9mMvHaKK3sDNKu9VGffbSe8bxLTPiml5IpwMEUZeeV2Y4EO5PcCXVsKk4 X-Received: by 2002:a05:6214:1d2f:b0:67a:5be3:f0f8 with SMTP id f15-20020a0562141d2f00b0067a5be3f0f8mr1738125qvd.19.1701172227778; Tue, 28 Nov 2023 03:50:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701172227; cv=pass; d=google.com; s=arc-20160816; b=E2wajOYL6vtSC2UcohchHKz+NwuMKkG8G1NCevqjmgie5kuTTVzc4JqAJUFZditB13 r6tMRAnyHm3Gk0u79NKloKeHHhTldU38pkvEybjfYkZ1IJIhxsSrfWwUu9PC3FahdA23 i0MpcOIpE3EVJDUl7HgovrfVO2LJFoEO7PmkEZvZOhzjP1yYeSTiUmf91K9oqbHNwSnm p+Wv9zTFWQfESLK+vkTr7ZHODl7Tif9kb+tE7zy//hbpPV/5w9g7gJTBJTXRLSrowyGR lp1kI3S8JrlNW0quJn1g4eh/O2t/cBn4GtgEG+r/JBfj0BGgcHNGjepbhvJI0b+lVGpM GyUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to: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:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=XN4ETMvl/+1tnmCJy3fTvUlZOS78GsFb+tjvEbW/js0=; fh=YSa8tbAsFM03BU4mjhbbHsdQe1vIF6KegOb6Q0/FrUw=; b=P8jvk13F+ASLsH7BU59uirmVjPix0eezbLzOLB/y1V+kviRpQsj9998zoUl9gWxbk5 VIKMVB0S5Kx3PHBNqnJezZg1N2l656XawkryYoOa72FTGGEbnAUGuIxNeGNkZAvfdlje 7otnABWBJl3n1qHXjvugQ+6l9anFbCYFykLTfOe9FDVri2/i498Cj5QZo7pcTGlmU9+l XQDnfmWaYamYJMuS36R88JpN2zBNo2UNpQHOUO8KY0F262MljWeAbPZUcV62+Cyxnd7X BSxa0IUIisPC41ASkHyxs8MqZPlRMtxmGMF2Vb49pUo0AirXBRkgat8AkHt3+TYCVsmI fvjQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AJSORxOM; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i9-20020ad44109000000b0067a2c0848casi6506346qvp.116.2023.11.28.03.50.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 03:50:27 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=AJSORxOM; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 907523881D3C for ; Tue, 28 Nov 2023 08:52:30 +0000 (GMT) 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 7967D38654AD for ; Tue, 28 Nov 2023 08:51:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7967D38654AD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7967D38654AD Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1031 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701161500; cv=none; b=BuflHajjMzjYWJpP7QcuQ17SRc6MpdtEZAPd+x4ZRm+2hCEJx1KMGlqLIJR9+ET2uGObu+0qmQ7EJ0rQgNn2BvWEycGTBcYOOt08o/NodC0zQ1Q1Wt5qygmMPJujvXISY0UmQRdyfTnPbCe5D+bcpuxazLGFLnkH2LzgJQp74ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701161500; c=relaxed/simple; bh=5gYhP505IbbZG0ikt9j6GcwMPq7VPfYOu5qj9luUR7U=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=C/mryVGMIcEwi0YbQeC92dr4CKFIlJeqt4KD5F8AZ1Bxn5rTgLO0EI0fX88ypKc9wzPzBZIzfM2PKKGoy4h0WTGKuex59px5PJNNEX4nRsq+TNuU/jBHQOgnYjwoh11J9/vsl490jGPViSVgzxOelPLdgrCswShypV53LMMxiOY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-27fe16e8e02so988558a91.0 for ; Tue, 28 Nov 2023 00:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701161497; x=1701766297; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XN4ETMvl/+1tnmCJy3fTvUlZOS78GsFb+tjvEbW/js0=; b=AJSORxOMr/C23KXtRJU0iYHM4p8NkWITL4eGP21FkK2uP6GLyNaPL7xbl4wUGM20Or VD7pHErtgr8476To0MYcvE2ljcTrmzZ93PGVIei46d+YITdfo+Ui91h8JgWmuZ+Rr3Lj r/XzmfoPoLmlayYOyzfBsiTzs/LMiZSLWD8Fx+u6p7ORw4Tk4DD/T/l3OZMjtB1vArWT JfAAtPqZaHa1WL2Y1Dzlf7x5D+p7kGi3K7kLIVnZXnaXVVZ7Lc2NMGIt6BWgNEgY/2hg R5zifCvzmsFMI4Ktob54Lw1FEfp3uVoNVConIe1zYJoYIbKHZqlCAIcVCYeKIkBhuCxf YvxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701161497; x=1701766297; 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=XN4ETMvl/+1tnmCJy3fTvUlZOS78GsFb+tjvEbW/js0=; b=mIv1jsdQGkw3b63O6n5naeoda3uidn2T7IBalr6ofDAdcOQh6fdczwvN1RC806+/fo RelqXCSwooGL0nCaSGIlxU2/Gz/4nyapUUQolkNA5sTvpbP+qWWtrijtPw6njt8Tk/Gj 42x5VoKvseiZkAUUDzMg/+solnKgs3MTcgidg91Z4PG9FrwGiHkeh6DAT5Ze0LHXQ6hc +VGN/qlDVnwwyFY+Me522UH/Hh9PjKweDMBpdg4ukKh+tF/uXYh51GTmAtDZMd3nFd92 Uk4DgO0Isg+PVDpU/0AsCXm/qhTvIeLmrPppnPtfTjGXDl7JkZXHxrQRRhdM9GaMRN0D tY8Q== X-Gm-Message-State: AOJu0YxW8mrjqCZCGf0NJ+eOUhceNY9ClzqEh1Fq2A8/P7kepu/jFIQi GmU/j7eNhPLTdSXkhQHlJuU/B50kb3Sk//HG X-Received: by 2002:a17:90b:2315:b0:283:9d45:a815 with SMTP id mt21-20020a17090b231500b002839d45a815mr14758634pjb.3.1701161497411; Tue, 28 Nov 2023 00:51:37 -0800 (PST) Received: from localhost (zz20184013906F627101.userreverse.dion.ne.jp. [111.98.113.1]) by smtp.gmail.com with ESMTPSA id mn24-20020a17090b189800b0026f4bb8b2casm9009552pjb.6.2023.11.28.00.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 00:51:36 -0800 (PST) From: Tatsuyuki Ishi To: binutils@sourceware.org Cc: i@maskray.me, nelson@rivosinc.com, rui314@gmail.com, ruiu@bluewhale.systems, Tatsuyuki Ishi Subject: [PATCH v3 4/9] RISC-V: Define and use GOT entry size constants for TLS. Date: Tue, 28 Nov 2023 17:51:04 +0900 Message-ID: <20231128085109.28422-5-ishitatsuyuki@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231128085109.28422-1-ishitatsuyuki@gmail.com> References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> <20231128085109.28422-1-ishitatsuyuki@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 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, T_SCC_BODY_TEXT_LINE 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: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774500850174321211 X-GMAIL-MSGID: 1783808369955876210 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 c0207765906..d5190538503 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -298,6 +298,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? */ @@ -1320,7 +1322,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); } @@ -1328,14 +1330,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); @@ -1563,20 +1565,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); } @@ -2912,7 +2914,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;