From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
To: binutils@sourceware.org
Cc: i@maskray.me, nelson@rivosinc.com, rui314@gmail.com,
ruiu@bluewhale.systems, Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Subject: [PATCH v4 7/9] RISC-V: Unify TLS handling in check_relocs.
Date: Wed, 21 Feb 2024 02:55:54 +0900 [thread overview]
Message-ID: <20240220175556.304692-8-ishitatsuyuki@gmail.com> (raw)
In-Reply-To: <20240220175556.304692-1-ishitatsuyuki@gmail.com>
With the introduction of transition, multiple relocation types may map to
GOT_TLS_IE or GOT_TLS_LE and it makes more sense to unify the code path to
perform checks common to them.
bfd/
* elfnn-riscv.c (riscv_elf_check_relocs): Merge switch cases for
TLS relocs.
---
bfd/elfnn-riscv.c | 64 +++++++++++++++++++++++++++--------------------
1 file changed, 37 insertions(+), 27 deletions(-)
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 1594856ccef..1fbb0698ce1 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -662,6 +662,24 @@ riscv_elf_copy_indirect_symbol (struct bfd_link_info *info,
_bfd_elf_link_hash_copy_indirect (info, dir, ind);
}
+static char
+riscv_elf_tls_type_from_hi_reloc (unsigned int r_type)
+{
+ switch (r_type)
+ {
+ case R_RISCV_TLS_GD_HI20:
+ return GOT_TLS_GD;
+ case R_RISCV_TLS_GOT_HI20:
+ return GOT_TLS_IE;
+ case R_RISCV_TLSDESC_HI20:
+ return GOT_TLSDESC;
+ case R_RISCV_TPREL_HI20:
+ return GOT_TLS_LE;
+ default:
+ abort ();
+ }
+}
+
static bool
riscv_elf_record_tls_type (bfd *abfd, struct bfd_link_info *info,
struct elf_link_hash_entry *h,
@@ -843,19 +861,26 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
switch (r_type)
{
- case R_RISCV_TLS_GD_HI20:
- if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
- || !riscv_elf_record_tls_type (abfd, info, h, r_symndx,
- GOT_TLS_GD))
- return false;
- break;
+ case R_RISCV_TLS_GD_HI20:
+ case R_RISCV_TLS_GOT_HI20:
+ case R_RISCV_TLSDESC_HI20:
+ case R_RISCV_TPREL_HI20:
+ {
+ char tls_type = riscv_elf_tls_type_from_hi_reloc (r_type);
- case R_RISCV_TLS_GOT_HI20:
- if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
- || !riscv_elf_record_tls_type (abfd, info, h, r_symndx,
- GOT_TLS_IE))
- return false;
- break;
+ /* Local exec is only allowed for executables. */
+ if (tls_type == GOT_TLS_LE && !bfd_link_executable (info))
+ return bad_static_reloc (abfd, r_type, h);
+
+ if (tls_type != GOT_TLS_LE
+ && !riscv_elf_record_got_reference (abfd, info, h, r_symndx))
+ return false;
+ if ((tls_type != GOT_TLS_LE || h != NULL)
+ && !riscv_elf_record_tls_type (abfd, info, h, r_symndx,
+ tls_type))
+ return false;
+ break;
+ }
case R_RISCV_GOT_HI20:
if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
@@ -864,12 +889,6 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
return false;
break;
- case R_RISCV_TLSDESC_HI20:
- if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
- || !riscv_elf_record_tls_type (abfd, info, h, r_symndx,
- GOT_TLSDESC))
- return false;
- break;
case R_RISCV_CALL:
case R_RISCV_CALL_PLT:
@@ -953,15 +972,6 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
break;
goto static_reloc;
- case R_RISCV_TPREL_HI20:
- /* This is not allowed in the pic, but okay in pie. */
- if (!bfd_link_executable (info))
- return bad_static_reloc (abfd, r_type, h);
- if (h != NULL
- && !riscv_elf_record_tls_type (abfd, info, h, r_symndx, GOT_TLS_LE))
- return false;
- break;
-
case R_RISCV_HI20:
if (bfd_link_pic (info))
return bad_static_reloc (abfd, r_type, h);
--
2.43.2
next prev parent reply other threads:[~2024-02-20 17:56 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 18:08 [PATCH 0/4] RISC-V: Implement TLS Descriptors Tatsuyuki Ishi
2023-08-17 18:08 ` [PATCH 1/4] RISC-V: Add TLSDESC reloc definitions Tatsuyuki Ishi
2023-08-17 18:08 ` [PATCH 2/4] RISC-V: Add assembly support for TLSDESC Tatsuyuki Ishi
2023-08-17 18:08 ` [PATCH 3/4] RISC-V: Define and use GOT entry size constants for TLS Tatsuyuki Ishi
2023-08-17 18:08 ` [PATCH 4/4] RISC-V: Initial ld.bfd support for TLSDESC Tatsuyuki Ishi
2023-08-18 0:22 ` [PATCH 0/4] RISC-V: Implement TLS Descriptors Nelson Chu
2023-08-18 7:13 ` Fangrui Song
2023-08-31 17:13 ` [PATCH v2 0/5] " Tatsuyuki Ishi
2023-08-31 17:13 ` [PATCH v2 1/5] RISC-V: Fix local GOT and reloc size calculation for TLS Tatsuyuki Ishi
2024-02-21 0:49 ` Nelson Chu
2024-02-21 7:04 ` Nelson Chu
2023-08-31 17:13 ` [PATCH v2 2/5] RISC-V: Add TLSDESC reloc definitions Tatsuyuki Ishi
2023-08-31 17:13 ` [PATCH v2 3/5] RISC-V: Add assembly support for TLSDESC Tatsuyuki Ishi
2023-08-31 17:13 ` [PATCH v2 4/5] RISC-V: Define and use GOT entry size constants for TLS Tatsuyuki Ishi
2023-08-31 17:13 ` [PATCH v2 5/5] RISC-V: Initial ld.bfd support for TLSDESC Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 0/9] RISC-V: Implement TLS Descriptors Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 1/9] RISC-V: Fix local GOT and reloc size calculation for TLS Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 2/9] RISC-V: Add TLSDESC reloc definitions Tatsuyuki Ishi
2024-02-19 0:49 ` Nelson Chu
2024-02-20 17:28 ` Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 3/9] RISC-V: Add assembly support for TLSDESC Tatsuyuki Ishi
2024-02-19 1:44 ` Nelson Chu
2024-02-20 17:29 ` Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 4/9] RISC-V: Define and use GOT entry size constants for TLS Tatsuyuki Ishi
2024-02-19 1:57 ` Nelson Chu
2024-02-20 17:32 ` Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 5/9] RISC-V: Initial ld.bfd support for TLSDESC Tatsuyuki Ishi
2024-02-19 4:33 ` Nelson Chu
2024-02-20 17:36 ` Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 6/9] RISC-V: Move STATIC_TLS handling into record_tls_type Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 7/9] RISC-V: Unify TLS handling in check_relocs Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 8/9] RISC-V: Add elf_link_hash_entry to relax_func args Tatsuyuki Ishi
2023-11-28 8:51 ` [PATCH v3 9/9] RISC-V: Introduce TLSDESC relaxation Tatsuyuki Ishi
2023-12-05 16:44 ` [PATCH v3 0/9] RISC-V: Implement TLS Descriptors Tatsuyuki Ishi
2023-12-06 0:33 ` Nelson Chu
2023-12-07 3:35 ` Fangrui Song
2023-12-13 0:27 ` Palmer Dabbelt
2023-12-13 1:53 ` Tatsuyuki Ishi
2024-01-27 0:57 ` Fangrui Song
2024-02-20 17:55 ` [PATCH v4 " Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 1/9] RISC-V: Fix local GOT and reloc size calculation for TLS Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 2/9] RISC-V: Add TLSDESC reloc definitions Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 3/9] RISC-V: Add assembly support for TLSDESC Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 4/9] RISC-V: Define and use GOT entry size constants for TLS Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 5/9] RISC-V: Initial ld.bfd support for TLSDESC Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 6/9] RISC-V: Move STATIC_TLS handling into record_tls_type Tatsuyuki Ishi
2024-02-20 17:55 ` Tatsuyuki Ishi [this message]
2024-02-20 17:55 ` [PATCH v4 8/9] RISC-V: Add elf_link_hash_entry to relax_func args Tatsuyuki Ishi
2024-02-20 17:55 ` [PATCH v4 9/9] RISC-V: Introduce TLSDESC relaxation Tatsuyuki Ishi
2024-02-29 7:06 ` [PATCH v4 0/9] RISC-V: Implement TLS Descriptors Nelson Chu
2024-02-29 7:14 ` Tatsuyuki Ishi
2024-03-29 6:22 ` Tatsuyuki Ishi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240220175556.304692-8-ishitatsuyuki@gmail.com \
--to=ishitatsuyuki@gmail.com \
--cc=binutils@sourceware.org \
--cc=i@maskray.me \
--cc=nelson@rivosinc.com \
--cc=rui314@gmail.com \
--cc=ruiu@bluewhale.systems \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).