85 lines
2.9 KiB
Diff
85 lines
2.9 KiB
Diff
From f0efc301a550708ea07b8dad127d5cb149661d24 Mon Sep 17 00:00:00 2001
|
|
From: Xi Ruoyao <xry111@xry111.site>
|
|
Date: Fri, 2 Feb 2024 21:00:58 +0800
|
|
Subject: [PATCH 055/123] LoongArch: gas: Fix the types of symbols referred
|
|
with %le_*_r in the symtab
|
|
|
|
When a symbol is referred with %le_{hi20,lo12,add}_r, it's definitely a
|
|
TLS symbol and we should set its type to TLS in the symtab. Otherwise
|
|
when building Perl with gcc-14 -flto, we get:
|
|
|
|
/usr/bin/ld: PL_current_context: TLS definition in
|
|
./miniperl.ltrans0.ltrans.o section .tbss mismatches non-TLS reference
|
|
in ./miniperl.ltrans1.ltrans.o
|
|
|
|
A minimal reproducer:
|
|
|
|
$ cat t1.s
|
|
.section .tbss
|
|
.globl x
|
|
x: .word 0
|
|
$ cat t2.s
|
|
f:
|
|
lu12i.w $a0, %le_hi20_r(x)
|
|
add.d $a0, $a0, $tp, %le_add_r(x)
|
|
li.w $a1, 1
|
|
st.w $a1, $a0, %le_lo12_r(x)
|
|
$ gas/as-new t1.s -o t1.o
|
|
$ gas/as-new t2.s -o t2.o
|
|
$ ld/ld-new t1.o t2.o
|
|
ld/ld-new: x: TLS definition in t1.o section .tbss mismatches
|
|
non-TLS reference in t2.o
|
|
|
|
Unfortunately this was undetected before Binutils-2.42 release because
|
|
GCC < 14 does not use %le_*_r, and without LTO it's very rare to have a
|
|
TLS LE definition and its reference in two different translation units.
|
|
So this fix should be backported to Binutils-2.42 branch too.
|
|
|
|
Signed-off-by: Xi Ruoyao <xry111@xry111.site>
|
|
---
|
|
gas/config/tc-loongarch.c | 3 +++
|
|
gas/testsuite/gas/loongarch/tls_le_r_sym_type.d | 3 +++
|
|
gas/testsuite/gas/loongarch/tls_le_r_sym_type.s | 6 ++++++
|
|
3 files changed, 12 insertions(+)
|
|
create mode 100644 gas/testsuite/gas/loongarch/tls_le_r_sym_type.d
|
|
create mode 100644 gas/testsuite/gas/loongarch/tls_le_r_sym_type.s
|
|
|
|
diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
|
|
index 0495f63a..5e96f624 100644
|
|
--- a/gas/config/tc-loongarch.c
|
|
+++ b/gas/config/tc-loongarch.c
|
|
@@ -1340,6 +1340,9 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
|
|
case BFD_RELOC_LARCH_TLS_DESC_LO12:
|
|
case BFD_RELOC_LARCH_TLS_DESC64_LO20:
|
|
case BFD_RELOC_LARCH_TLS_DESC64_HI12:
|
|
+ case BFD_RELOC_LARCH_TLS_LE_ADD_R:
|
|
+ case BFD_RELOC_LARCH_TLS_LE_HI20_R:
|
|
+ case BFD_RELOC_LARCH_TLS_LE_LO12_R:
|
|
/* Add tls lo (got_lo reloc type). */
|
|
if (fixP->fx_addsy == NULL)
|
|
as_bad_where (fixP->fx_file, fixP->fx_line,
|
|
diff --git a/gas/testsuite/gas/loongarch/tls_le_r_sym_type.d b/gas/testsuite/gas/loongarch/tls_le_r_sym_type.d
|
|
new file mode 100644
|
|
index 00000000..43bcd789
|
|
--- /dev/null
|
|
+++ b/gas/testsuite/gas/loongarch/tls_le_r_sym_type.d
|
|
@@ -0,0 +1,3 @@
|
|
+#readelf: -s
|
|
+#...
|
|
+.*TLS[ \t]+GLOBAL[ \t]+DEFAULT[ \t]+UND[ \t]+x
|
|
diff --git a/gas/testsuite/gas/loongarch/tls_le_r_sym_type.s b/gas/testsuite/gas/loongarch/tls_le_r_sym_type.s
|
|
new file mode 100644
|
|
index 00000000..3ccedae9
|
|
--- /dev/null
|
|
+++ b/gas/testsuite/gas/loongarch/tls_le_r_sym_type.s
|
|
@@ -0,0 +1,6 @@
|
|
+f:
|
|
+ lu12i.w $a0, %le_hi20_r(x)
|
|
+ add.d $a0, $a0, $tp, %le_add_r(x)
|
|
+ li.w $a1, 1
|
|
+ st.w $a1, $a0, %le_lo12_r(x)
|
|
+ ret
|
|
--
|
|
2.33.0
|
|
|