Backport/20.x: [LoongArch] Fix the type of tls-le symbols

[zhaoqi5]

(cherry picked from commit d6dc74e)

[llvmbot]

@llvm/pr-subscribers-backend-loongarch

Author: ZhaoQi (zhaoqi5)

Changes

(cherry picked from commit d6dc74e)

---

Full diff: https://github.com/llvm/llvm-project/pull/133027.diff

2 Files Affected:

• (modified) llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp (+1)
• (modified) llvm/test/CodeGen/LoongArch/fix-tle-le-sym-type.ll (+4-4)

diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
index 30d2d0c1184ad..5698468c4754e 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
@@ -275,6 +275,7 @@ void LoongArchMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const {
   case VK_LoongArch_TLS_GD_HI20:
   case VK_LoongArch_TLS_DESC_PC_HI20:
   case VK_LoongArch_TLS_DESC_HI20:
+  case VK_LoongArch_TLS_LE_HI20_R:
   case VK_LoongArch_TLS_LD_PCREL20_S2:
   case VK_LoongArch_TLS_GD_PCREL20_S2:
   case VK_LoongArch_TLS_DESC_PCREL20_S2:
diff --git a/llvm/test/CodeGen/LoongArch/fix-tle-le-sym-type.ll b/llvm/test/CodeGen/LoongArch/fix-tle-le-sym-type.ll
index fe5f2195f0dc7..d39454a51a445 100644
--- a/llvm/test/CodeGen/LoongArch/fix-tle-le-sym-type.ll
+++ b/llvm/test/CodeGen/LoongArch/fix-tle-le-sym-type.ll
@@ -5,12 +5,12 @@
 ; RUN: llvm-readelf -s %t-la64 | FileCheck %s --check-prefix=LA64
 
 ; LA32:      Symbol table '.symtab' contains [[#]] entries:
-; LA32-NEXT:    Num:    Value  Size Type    Bind   Vis      Ndx Name
-; LA32:              00000000     0 NOTYPE  GLOBAL DEFAULT  UND tls_sym
+; LA32-NEXT:    Num:    Value  Size Type  Bind   Vis      Ndx Name
+; LA32:              00000000     0 TLS   GLOBAL DEFAULT  UND tls_sym
 
 ; LA64:      Symbol table '.symtab' contains [[#]] entries:
-; LA64-NEXT:    Num:    Value          Size Type    Bind   Vis      Ndx Name
-; LA64:              0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND tls_sym
+; LA64-NEXT:    Num:    Value          Size Type  Bind   Vis      Ndx Name
+; LA64:              0000000000000000     0 TLS   GLOBAL DEFAULT  UND tls_sym
 
 @tls_sym = external thread_local(localexec) global i32
 

[SixWeining]

LGTM

[MaskRay]

LGTM.

Note: test/CodeGen is probably not the best place for such tests. test/MC/CSKY/relocation-specifier.s contains a nice example and tests multiple relocations at the same time.

[tstellar]

LGTM.

Note: test/CodeGen is probably not the best place for such tests. test/MC/CSKY/relocation-specifier.s contains a nice example and tests multiple relocations at the same time.

Will this be fixed in the main branch?

[zhaoqi5]

LGTM.
Note: test/CodeGen is probably not the best place for such tests. test/MC/CSKY/relocation-specifier.s contains a nice example and tests multiple relocations at the same time.

Will this be fixed in the main branch?

Thanks. I have open a new PR (#133839) to fix this in the main branch.
Do you think we should merge this PR and then cherry-pick the new PR, or simply add the modifications of the new PR to this PR? @tstellar

[zhaoqi5]

LGTM.

Note: test/CodeGen is probably not the best place for such tests. test/MC/CSKY/relocation-specifier.s contains a nice example and tests multiple relocations at the same time.

Modified in #133839, thanks.

[github-actions]

@zhaoqi5 (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.