72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From a96dee6ba3c916f9a4329b196a0c5a1652fe294f Mon Sep 17 00:00:00 2001
|
|
From: Lulu Cheng <chenglulu@loongson.cn>
|
|
Date: Thu, 18 Aug 2022 09:57:14 +0800
|
|
Subject: [PATCH 010/124] LoongArch: Get __tls_get_addr address through got
|
|
table when disable plt.
|
|
|
|
Fix bug, ICE with tls gd/ld var with -fno-plt.
|
|
|
|
gcc/ChangeLog:
|
|
|
|
* config/loongarch/loongarch.cc (loongarch_call_tls_get_addr):
|
|
Get __tls_get_addr address through got table when disable plt.
|
|
|
|
gcc/testsuite/ChangeLog:
|
|
|
|
* gcc.target/loongarch/tls-gd-noplt.c: New test.
|
|
|
|
Signed-off-by: Peng Fan <fanpeng@loongson.cn>
|
|
Signed-off-by: ticat_fp <fanpeng@loongson.cn>
|
|
---
|
|
gcc/config/loongarch/loongarch.cc | 14 ++++++++++++--
|
|
gcc/testsuite/gcc.target/loongarch/tls-gd-noplt.c | 12 ++++++++++++
|
|
2 files changed, 24 insertions(+), 2 deletions(-)
|
|
create mode 100644 gcc/testsuite/gcc.target/loongarch/tls-gd-noplt.c
|
|
|
|
diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
|
|
index 1b5af2c7d..76bf55ea4 100644
|
|
--- a/gcc/config/loongarch/loongarch.cc
|
|
+++ b/gcc/config/loongarch/loongarch.cc
|
|
@@ -2448,8 +2448,18 @@ loongarch_call_tls_get_addr (rtx sym, enum loongarch_symbol_type type, rtx v0)
|
|
gcc_unreachable ();
|
|
}
|
|
|
|
- insn = emit_call_insn (gen_call_value_internal (v0, loongarch_tls_symbol,
|
|
- const0_rtx));
|
|
+ if (flag_plt)
|
|
+ insn = emit_call_insn (gen_call_value_internal (v0, loongarch_tls_symbol,
|
|
+ const0_rtx));
|
|
+ else
|
|
+ {
|
|
+ rtx dest = gen_reg_rtx (Pmode);
|
|
+ rtx high = gen_reg_rtx (Pmode);
|
|
+ loongarch_emit_move (high, gen_rtx_HIGH (Pmode, loongarch_tls_symbol));
|
|
+ emit_insn (gen_ld_from_got (Pmode, dest, high, loongarch_tls_symbol));
|
|
+ insn = emit_call_insn (gen_call_value_internal (v0, dest, const0_rtx));
|
|
+ }
|
|
+
|
|
RTL_CONST_CALL_P (insn) = 1;
|
|
use_reg (&CALL_INSN_FUNCTION_USAGE (insn), a0);
|
|
insn = get_insns ();
|
|
diff --git a/gcc/testsuite/gcc.target/loongarch/tls-gd-noplt.c b/gcc/testsuite/gcc.target/loongarch/tls-gd-noplt.c
|
|
new file mode 100644
|
|
index 000000000..32a0acf9b
|
|
--- /dev/null
|
|
+++ b/gcc/testsuite/gcc.target/loongarch/tls-gd-noplt.c
|
|
@@ -0,0 +1,12 @@
|
|
+/* { dg-do compile } */
|
|
+/* { dg-options "-O2 -fno-plt -mcmodel=normal" } */
|
|
+/* { dg-final { scan-assembler "pcalau12i\t.*%got_pc_hi20\\(__tls_get_addr\\)" } } */
|
|
+
|
|
+__attribute__ ((tls_model ("global-dynamic"))) __thread int a;
|
|
+
|
|
+void
|
|
+test (void)
|
|
+{
|
|
+ a = 10;
|
|
+}
|
|
+
|
|
--
|
|
2.33.0
|
|
|