c1497d86e3
- riscv-dynamic-tls-reloc-pie.patch: Backport for PR ld/22263 and PR ld/25694 - riscv-pr22263-1.patch: Backport for PR ld/22263 OBS-URL: https://build.opensuse.org/request/show/1089774 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=445
104 lines
3.5 KiB
Diff
104 lines
3.5 KiB
Diff
From f491758f183592cbf8113e02a2bebbd412ff7358 Mon Sep 17 00:00:00 2001
|
|
From: Nelson Chu <nelson@nelson.ba.rivosinc.com>
|
|
Date: Thu, 4 May 2023 17:08:50 +0800
|
|
Subject: [PATCH] [PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs
|
|
in PIE.
|
|
|
|
Lots of targets already fixed the TEXTREL problem for TLS in PIE.
|
|
|
|
* For PR ld/25694,
|
|
In the check_reloc, refer to spare and loongarch, they don't need to reserve
|
|
any local dynamic reloc for TLS LE in pie/pde, and similar to other targets.
|
|
So it seems like riscv was too conservative to estimate the TLS LE before.
|
|
Just break and don't goto static_reloc for TLS LE in pie/pde can fix the
|
|
TEXTREL problem.
|
|
|
|
* For PR ld/22263,
|
|
The risc-v code for TLS GD/IE in the relocate_section seems same as MIPS port.
|
|
So similar to MIPS, pr22570, commits 9143e72c6d4d and 1cb83cac9a89, it seems
|
|
also the right way to do the same thing for risc-v.
|
|
|
|
On risc-v, fixes
|
|
FAIL: Build pr22263-1
|
|
|
|
RISC-V haven't supported the TLS transitions, so will need the same fix (use
|
|
bfd_link_dll) in the future.
|
|
|
|
bfd/
|
|
PR ld/22263
|
|
PR ld/25694
|
|
* elfnn-riscv.c (riscv_elf_check_relocs): Replace bfd_link_pic with
|
|
bfd_link_dll for TLS IE. Don't need to reserve the local dynamic
|
|
relocation for TLS LE in pie/pde, and report error in pic just like
|
|
before.
|
|
(riscv_elf_relocate_section): For TLS GD/IE, use bfd_link_dll rather
|
|
than !bfd_link_pic in determining the dynamic symbol index. Avoid
|
|
the index of -1.
|
|
---
|
|
bfd/elfnn-riscv.c | 25 +++++++++++--------------
|
|
1 file changed, 11 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
|
|
index 4a5da7df3fe..ee2d19f7699 100644
|
|
--- a/bfd/elfnn-riscv.c
|
|
+++ b/bfd/elfnn-riscv.c
|
|
@@ -732,7 +732,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
|
|
break;
|
|
|
|
case R_RISCV_TLS_GOT_HI20:
|
|
- if (bfd_link_pic (info))
|
|
+ if (bfd_link_dll (info))
|
|
info->flags |= DF_STATIC_TLS;
|
|
if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
|
|
|| !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
|
|
@@ -787,11 +787,12 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
|
|
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, h, r_symndx, GOT_TLS_LE);
|
|
- goto static_reloc;
|
|
+ break;
|
|
|
|
case R_RISCV_HI20:
|
|
if (bfd_link_pic (info))
|
|
@@ -2689,24 +2690,20 @@ riscv_elf_relocate_section (bfd *output_bfd,
|
|
if (htab->elf.srelgot == NULL)
|
|
abort ();
|
|
|
|
- if (h != NULL)
|
|
- {
|
|
- bool dyn, pic;
|
|
- dyn = htab->elf.dynamic_sections_created;
|
|
- pic = bfd_link_pic (info);
|
|
-
|
|
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
|
|
- && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
|
|
- indx = h->dynindx;
|
|
- }
|
|
+ bool dyn = elf_hash_table (info)->dynamic_sections_created;
|
|
+ if (h != NULL
|
|
+ && h->dynindx != -1
|
|
+ && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
|
|
+ && (bfd_link_dll (info) || !SYMBOL_REFERENCES_LOCAL (info, h)))
|
|
+ indx = h->dynindx;
|
|
|
|
/* The GOT entries have not been initialized yet. Do it
|
|
now, and emit any relocations. */
|
|
- if ((bfd_link_pic (info) || indx != 0)
|
|
+ if ((bfd_link_dll (info) || indx != 0)
|
|
&& (h == NULL
|
|
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
|| h->root.type != bfd_link_hash_undefweak))
|
|
- need_relocs = true;
|
|
+ need_relocs = true;
|
|
|
|
if (tls_type & GOT_TLS_GD)
|
|
{
|
|
--
|
|
2.40.1
|
|
|