[llvm] 6e4e88d - [test] Improve R_RISCV_PLT32 and R_RISCV_GOT32_PCREL tests

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-22T12:38:46-07:00
New Revision: 6e4e88d4cccb4903dff4144cd86c4f966e4ae09c

URL: https://github.com/llvm/llvm-project/commit/6e4e88d4cccb4903dff4144cd86c4f966e4ae09c
DIFF: https://github.com/llvm/llvm-project/commit/6e4e88d4cccb4903dff4144cd86c4f966e4ae09c.diff

LOG: [test] Improve R_RISCV_PLT32 and R_RISCV_GOT32_PCREL tests

Added: 
    llvm/test/MC/RISCV/data-directive-specifier.s

Modified: 
    

Removed: 
    llvm/test/MC/RISCV/elf-reloc-got32-pcrel.s
    llvm/test/MC/RISCV/elf-reloc-plt32.s


################################################################################
diff  --git a/llvm/test/MC/RISCV/data-directive-specifier.s b/llvm/test/MC/RISCV/data-directive-specifier.s
new file mode 100644
index 0000000000000..a578f9720eccd
--- /dev/null
+++ b/llvm/test/MC/RISCV/data-directive-specifier.s
@@ -0,0 +1,43 @@
+# RUN: llvm-mc -triple=riscv64 -filetype=obj %s | llvm-readobj -r - | FileCheck %s --check-prefixes=CHECK,RV64
+# RUN: llvm-mc -triple=riscv32 -filetype=obj %s | llvm-readobj -r - | FileCheck %s --check-prefixes=CHECK,RV32
+
+# RUN: not llvm-mc -triple=riscv64 -filetype=obj %s --defsym ERR=1 -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
+
+.globl g
+g:
+l:
+
+# CHECK:      Section ({{.*}}) .rela.data {
+# CHECK-NEXT:   0x0 R_RISCV_PLT32 l 0x0
+# CHECK-NEXT:   0x4 R_RISCV_PLT32 l 0x4
+# CHECK-NEXT:   0x8 R_RISCV_PLT32 extern 0x4
+# CHECK-NEXT:   0xC R_RISCV_PLT32 g 0x8
+# CHECK-NEXT:   0x10 R_RISCV_PLT32 g 0x18
+# CHECK-NEXT: }
+.data
+.word l at plt - .
+.word l at plt - .data
+
+.word extern at plt - . + 4
+.word g at plt - . + 8
+.word g at plt - .data + 8
+
+# CHECK:      Section ({{.*}}) .rela.data1 {
+# CHECK-NEXT:   0x0 R_RISCV_GOT32_PCREL data1 0x0
+# CHECK-NEXT:   0x4 R_RISCV_GOT32_PCREL extern 0x4
+# RV32-NEXT:    0x8 R_RISCV_GOT32_PCREL extern 0xFFFFFFFB
+# RV64-NEXT:    0x8 R_RISCV_GOT32_PCREL extern 0xFFFFFFFFFFFFFFFB
+# CHECK-NEXT: }
+.section .data1,"aw"
+data1:
+.word data1 at GOTPCREL
+.word extern at gotpcrel+4
+.word extern at GOTPCREL-5
+
+.ifdef ERR
+# ERR: [[#@LINE+1]]:7: error: symbol 'und' can not be undefined in a subtraction expression
+.word extern at plt - und
+
+# ERR: [[#@LINE+1]]:7: error: symbol 'und' can not be undefined in a subtraction expression
+.word extern at gotpcrel - und
+.endif

diff  --git a/llvm/test/MC/RISCV/elf-reloc-got32-pcrel.s b/llvm/test/MC/RISCV/elf-reloc-got32-pcrel.s
deleted file mode 100644
index 32a1d57fb5360..0000000000000
--- a/llvm/test/MC/RISCV/elf-reloc-got32-pcrel.s
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: llvm-mc -triple=riscv64 -filetype=obj %s -o - | \
-// RUN:   llvm-readobj -r - | FileCheck %s
-
-        .section .data
-this:
-        .word this at GOTPCREL
-        .word extern_sym at GOTPCREL+4
-        .word negative_offset at GOTPCREL-4
-
-// CHECK:      Section ({{.*}}) .rela.data
-// CHECK-NEXT:   0x0 R_RISCV_GOT32_PCREL this 0x0
-// CHECK-NEXT:   0x4 R_RISCV_GOT32_PCREL extern_sym 0x4
-// CHECK-NEXT:   0x8 R_RISCV_GOT32_PCREL negative_offset 0xFFFFFFFFFFFFFFFC
-// CHECK-NEXT: }

diff  --git a/llvm/test/MC/RISCV/elf-reloc-plt32.s b/llvm/test/MC/RISCV/elf-reloc-plt32.s
deleted file mode 100644
index f93262a138a91..0000000000000
--- a/llvm/test/MC/RISCV/elf-reloc-plt32.s
+++ /dev/null
@@ -1,16 +0,0 @@
-# RUN: llvm-mc -triple=riscv64 -filetype=obj %s -o - \
-# RUN:   | llvm-readobj -r - | FileCheck %s
-# RUN: llvm-mc -triple=riscv32 -filetype=obj %s -o - \
-# RUN:   | llvm-readobj -r - | FileCheck %s
-
-.globl func
-func:
-
-.data
-.word extern_func at PLT - . + 4
-.word func at PLT - . + 8
-
-# CHECK:      Section ({{.*}}) .rela.data {
-# CHECK-NEXT:   0x0 R_RISCV_PLT32 extern_func 0x4
-# CHECK-NEXT:   0x4 R_RISCV_PLT32 func 0x8
-# CHECK-NEXT: }