[PATCH] D156772: [lld][LoongArch] Support the R_LARCH_PCREL20_S2 relocation type

[Lu Weining via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG8a31f7ddb843: [lld][LoongArch] Support the R_LARCH_PCREL20_S2 relocation type (authored by SixWeining).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D156772/new/

https://reviews.llvm.org/D156772

Files:
  lld/ELF/Arch/LoongArch.cpp
  lld/test/ELF/loongarch-pcrel20-s2.s


Index: lld/test/ELF/loongarch-pcrel20-s2.s
===================================================================
--- /dev/null
+++ lld/test/ELF/loongarch-pcrel20-s2.s
@@ -0,0 +1,32 @@
+# REQUIRES: loongarch
+
+# RUN: llvm-mc --filetype=obj --triple=loongarch32-unknown-elf %s -o %t.la32.o
+# RUN: llvm-mc --filetype=obj --triple=loongarch64-unknown-elf %s -o %t.la64.o
+
+# RUN: ld.lld %t.la32.o --section-start=.text=0x20000 --section-start=.data=0x20008 -o %t.la32.1
+# RUN: ld.lld %t.la64.o --section-start=.text=0x20000 --section-start=.data=0x20008 -o %t.la64.1
+# RUN: llvm-objdump --no-show-raw-insn -d %t.la32.1 | FileCheck --match-full-lines %s
+# RUN: llvm-objdump --no-show-raw-insn -d %t.la64.1 | FileCheck --match-full-lines %s
+# CHECK: 20000: pcaddi $t0, 2
+
+# RUN: not ld.lld %t.la32.o --section-start=.text=0x20000 --section-start=.data=0x220000 -o /dev/null 2>&1 | \
+# RUN:   FileCheck -DFILE=%t.la32.o --check-prefix=ERROR-RANGE %s
+# RUN: not ld.lld %t.la64.o --section-start=.text=0x20000 --section-start=.data=0x220000 -o /dev/null 2>&1 | \
+# RUN:   FileCheck -DFILE=%t.la64.o --check-prefix=ERROR-RANGE %s
+# ERROR-RANGE: error: [[FILE]]:(.text+0x0): relocation R_LARCH_PCREL20_S2 out of range: 2097152 is not in [-2097152, 2097151]; references section '.data'
+
+# RUN: not ld.lld %t.la32.o --section-start=.text=0x20000 --section-start=.data=0x40001 -o /dev/null 2>&1 | \
+# RUN:   FileCheck -DFILE=%t.la32.o --check-prefix=ERROR-ALIGN %s
+# RUN: not ld.lld %t.la64.o --section-start=.text=0x20000 --section-start=.data=0x40001 -o /dev/null 2>&1 | \
+# RUN:   FileCheck -DFILE=%t.la64.o --check-prefix=ERROR-ALIGN %s
+# ERROR-ALIGN: error: [[FILE]]:(.text+0x0): improper alignment for relocation R_LARCH_PCREL20_S2: 0x20001 is not aligned to 4 bytes
+
+.global _start
+
+_start:
+1:
+  pcaddi $t0, 0
+  .reloc 1b, R_LARCH_PCREL20_S2, .data
+
+.data
+  .word 0
Index: lld/ELF/Arch/LoongArch.cpp
===================================================================
--- lld/ELF/Arch/LoongArch.cpp
+++ lld/ELF/Arch/LoongArch.cpp
@@ -457,6 +457,7 @@
     return R_RISCV_ADD;
   case R_LARCH_32_PCREL:
   case R_LARCH_64_PCREL:
+  case R_LARCH_PCREL20_S2:
     return R_PC;
   case R_LARCH_B16:
   case R_LARCH_B21:
@@ -564,6 +565,12 @@
     write64le(loc, val);
     return;
 
+  case R_LARCH_PCREL20_S2:
+    checkInt(loc, val, 22, rel);
+    checkAlignment(loc, val, 4, rel);
+    write32le(loc, setJ20(read32le(loc), val >> 2));
+    return;
+
   case R_LARCH_B16:
     checkInt(loc, val, 18, rel);
     checkAlignment(loc, val, 4, rel);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D156772.548438.patch
Type: text/x-patch
Size: 2561 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230809/8286c0ee/attachment.bin>