[LLD][RISCV][NFC] Allow GNU linker to run RISCV LLD tests

[gkm]

Summary

Allow RISC-V LLD tests to run on GNU ld. This is useful for checking divergences in behavior.

[jrtc27]

Why can't people just symlink GNU ld to ld.lld?

[gkm]

Fix stale comment

[gkm]

In D124794#3486424, @jrtc27 wrote:

Why can't people just symlink GNU ld to ld.lld?

Since GNU ld has separate binaries for 32-bit and 64-bit, it's not a 1-for-1 replacement.

[gkm]

Add commented-out 32-bit GNU linker alongside 64-bit

[MaskRay]

I agree that people should just symlink ld.lld to ld.bfd to check this, or hack their local lit.local.cfg.
Such changes do not need to be in the upstream.

Note: many lld/test/ELF tests are very sensitive to addresses. I have improved many tests to be more or less address agnostic but many still do.
Sometimes addresses or offsets are hard-coded because otherwise it's difficult to detect errors like offset-by-N.
(I know that ld64, GNU ld, gold, and mold testsuite tend to check very little on the addresses and offsets => that makes them error-prone to such bugs.)

(BTW: Thanks for taking a look at RISC-V linker relaxation!)

[jrtc27]

What happens when we want to use LLD-specific options or are checking LLD-specific messages? Those tests aren't going to pass. Do we then need to annotate LLD tests with REQUIRES: lld-is-actually-lld? Is there any precedent for doing this on other architectures? This doesn't feel right to me.

[gkm]

In D124794#3486452, @jrtc27 wrote:

What happens when we want to use LLD-specific options or are checking LLD-specific messages? Those tests aren't going to pass. Do we then need to annotate LLD tests with REQUIRES: lld-is-actually-lld? Is there any precedent for doing this on other architectures? This doesn't feel right to me.

This is a developer aid for periodically checking divergences in behavior, it is not for production or routine use.
Failed tests are tolerable, and might merit a comment on a case-by-case basis.
There is precedent for testing against other linkers, e.g., MachO LLD vs. LD64.

[gkm]

In D124794#3486448, @MaskRay wrote:

I agree that people should just symlink ld.lld to ld.bfd to check this, or hack their local lit.local.cfg.
Such changes do not need to be in the upstream.

That would be easy if a single GNU ld were a drop-in replacement for ld.lld, but GNU ld is split into 32-bit and 64-bit configs.
I suppose a wrapper script that inspects ELF type of objects can suffice. For that matter, a wrapper script could find the right instance of GNU ld for any arch and ABI.
OK, you talked me into that approach.

[gkm]

RIP

lld/test/ELF/emulation-riscv.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
-# RUN: ld.lld %t.o -o %t
+# RUN: %lld_rv32 %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
-# RUN: ld.lld -m elf32lriscv %t.o -o %t
+# RUN: %lld_rv32 -m elf32lriscv %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-littleriscv)' > %t.script
-# RUN: ld.lld %t.script %t.o -o %t
+# RUN: %lld_rv32 %t.script %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
 
 # RV32:      ElfHeader {
 # RV32-NEXT:   Ident {
 # RV32-NEXT:     Magic: (7F 45 4C 46)
 # RV32-NEXT:     Class: 32-bit (0x1)
 # RV32-NEXT:     DataEncoding: LittleEndian (0x1)
 # RV32-NEXT:     FileVersion: 1

 # RV32-NEXT:   ProgramHeaderEntrySize: 32
 # RV32-NEXT:   ProgramHeaderCount:
 # RV32-NEXT:   SectionHeaderEntrySize: 40
 # RV32-NEXT:   SectionHeaderCount:
 # RV32-NEXT:   StringTableSectionIndex:
 # RV32-NEXT: }
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
-# RUN: ld.lld %t.o -o %t
+# RUN: %lld_rv64 %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
-# RUN: ld.lld -m elf64lriscv %t.o -o %t
+# RUN: %lld_rv64 -m elf64lriscv %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-littleriscv)' > %t.script
-# RUN: ld.lld %t.script %t.o -o %t
+# RUN: %lld_rv64 %t.script %t.o -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
 
 # RV64:      ElfHeader {
 # RV64-NEXT:   Ident {
 # RV64-NEXT:     Magic: (7F 45 4C 46)
 # RV64-NEXT:     Class: 64-bit (0x2)
 # RV64-NEXT:     DataEncoding: LittleEndian (0x1)
 # RV64-NEXT:     FileVersion: 1

lld/test/ELF/lit.local.cfg

+# -*- Python -*-
+
 config.suffixes = ['.test', '.s', '.ll', '.bat']
+
+# Allow RISC-V LLD tests to run on GNU ld. This is useful for checking
+# divergences in behavior.
+
+lld_rv32 = ('ld.lld')
+lld_rv64 = ('ld.lld') ### ('riscv64-unknown-linux-gnu-ld')
+
+config.substitutions.append(('%lld_rv32', lld_rv32))
+config.substitutions.append(('%lld_rv64', lld_rv64))

lld/test/ELF/riscv-attributes.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.o
-# RUN: ld.lld %t.o -o %t
+# RUN: %lld_rv64 %t.o -o %t
 # RUN: llvm-readelf --arch-specific %t | FileCheck %s
-# RUN: ld.lld %t.o %t.o -o %t2
+# RUN: %lld_rv64 %t.o %t.o -o %t2
 # RUN: llvm-readelf --arch-specific %t2 | FileCheck %s
 
 # CHECK:      BuildAttributes {
 # CHECK-NEXT:   FormatVersion: 0x41
 # CHECK-NEXT:   Section 1 {
 # CHECK-NEXT:     SectionLength: 52
 # CHECK-NEXT:     Vendor: riscv
 # CHECK-NEXT:     Tag: Tag_File (0x1)

lld/test/ELF/riscv-branch.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
 # RUN: llvm-objdump -d %t.rv32 | FileCheck %s --check-prefix=CHECK-32
 # RUN: llvm-objdump -d %t.rv64 | FileCheck %s --check-prefix=CHECK-64
 # CHECK-32: 63 02 00 00     beqz    zero, 0x110b8
 # CHECK-32: e3 1e 00 fe     bnez    zero, 0x110b4
 # CHECK-64: 63 02 00 00     beqz    zero, 0x11124
 # CHECK-64: e3 1e 00 fe     bnez    zero, 0x11120
 #
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv32.limits
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv64.limits
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv32.limits
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv64.limits
 # RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS-32 %s
 # RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS-64 %s
 # LIMITS-32:      e3 0f 00 7e     beqz    zero, 0x120b2
 # LIMITS-32-NEXT: 63 10 00 80     bnez    zero, 0x100b8
 # LIMITS-64:      e3 0f 00 7e     beqz    zero, 0x1211e
 # LIMITS-64-NEXT: 63 10 00 80     bnez    zero, 0x10124
 
-# RUN: not ld.lld %t.rv32.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not %lld_rv32 %t.rv32.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
 # ERROR-RANGE: relocation R_RISCV_BRANCH out of range: 2048 is not in [-2048, 2047]; references foo
 # ERROR-RANGE: relocation R_RISCV_BRANCH out of range: -2049 is not in [-2048, 2047]; references bar
 
-# RUN: not ld.lld %t.rv32.o --defsym foo=_start+1 --defsym bar=_start-1 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+1 --defsym bar=_start-1 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not %lld_rv32 %t.rv32.o --defsym foo=_start+1 --defsym bar=_start-1 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+1 --defsym bar=_start-1 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
 # ERROR-ALIGN: improper alignment for relocation R_RISCV_BRANCH: 0x1 is not aligned to 2 bytes
 
 .global _start
 _start:
      beq x0, x0, foo
      bne x0, x0, bar

lld/test/ELF/riscv-call.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv32
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv64
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv32
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv64
 # RUN: llvm-objdump -d %t.rv32 | FileCheck %s
 # RUN: llvm-objdump -d %t.rv64 | FileCheck %s
 # CHECK:      97 00 00 00     auipc   ra, 0
 # CHECK-NEXT: e7 80 80 00     jalr    8(ra)
 # CHECK:      97 00 00 00     auipc   ra, 0
 # CHECK-NEXT: e7 80 80 ff     jalr    -8(ra)
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv32.limits
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv64.limits
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv32.limits
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv64.limits
 # RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
 # RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
 # LIMITS:      97 f0 ff 7f     auipc   ra, 524287
 # LIMITS-NEXT: e7 80 f0 7f     jalr    2047(ra)
 # LIMITS-NEXT: 97 00 00 80     auipc   ra, 524288
 # LIMITS-NEXT: e7 80 00 80     jalr    -2048(ra)
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o /dev/null 2>&1 | \
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o /dev/null 2>&1 | \
 # RUN:   FileCheck --check-prefix=ERROR %s
 # ERROR: relocation R_RISCV_CALL out of range: 524288 is not in [-524288, 524287]; references foo
 # ERROR: relocation R_RISCV_CALL out of range: -524289 is not in [-524288, 524287]; references bar
 
 .global _start
 _start:
     call    foo
     call    bar

lld/test/ELF/riscv-elf-flags.s

 # REQUIRES: riscv
 
 # RUN: echo -n "BLOB" > %t.binary
-# RUN: ld.lld -m elf64lriscv -b binary %t.binary -o %t.out
+# RUN: %lld_rv64 -m elf64lriscv -b binary %t.binary -o %t.out
 # RUN: llvm-readobj -h %t.out | FileCheck %s
 
 # CHECK:      Flags [
 # CHECK-NEXT: ]

lld/test/ELF/riscv-gp-no-sdata.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
-# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32
 # RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
-# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: %lld_rv64 -pie %t.64.o -o %t.64
 # RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM %s
 
 ## If there is an undefined reference to __global_pointer$ but .sdata doesn't
 ## exist, define __global_pointer$ and set its st_shndx arbitrarily to 1.
 
 # SYM: {{0*}}00000800 0 NOTYPE GLOBAL DEFAULT 1 __global_pointer$
 
 lla gp, __global_pointer$

lld/test/ELF/riscv-gp.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+relax %s -o %t.32.o
-# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32
 # RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM32 %s
 # RUN: llvm-readelf -S %t.32 | FileCheck --check-prefix=SEC32 %s
 # RUN: llvm-objdump -d --print-imm-hex %t.32 | FileCheck --check-prefix=DIS32 %s
-# RUN: not ld.lld -shared %t.32.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
+# RUN: not %lld_rv32 -shared %t.32.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+relax %s -o %t.64.o
-# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: %lld_rv64 -pie %t.64.o -o %t.64
 # RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM64 %s
 # RUN: llvm-readelf -S %t.64 | FileCheck --check-prefix=SEC64 %s
 # RUN: llvm-objdump -d %t.64 | FileCheck --check-prefix=DIS64 %s
-# RUN: not ld.lld -shared %t.64.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
+# RUN: not %lld_rv64 -shared %t.64.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
 
 ## __global_pointer$ = .sdata+0x800 = 0x39c0
 # SEC32: [ 7] .sdata PROGBITS {{0*}}000031c0
 # SYM32: {{0*}}000039c0 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
 
 # SEC64: [ 7] .sdata PROGBITS {{0*}}000032e0
 # SYM64: {{0*}}00003ae0 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
 

lld/test/ELF/riscv-hi20-lo12.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
 
-# RUN: ld.lld %t.rv32.o --defsym foo=0 --defsym bar=42 -o %t.rv32
-# RUN: ld.lld %t.rv64.o --defsym foo=0 --defsym bar=42 -o %t.rv64
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=0 --defsym bar=42 -o %t.rv32
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=0 --defsym bar=42 -o %t.rv64
 # RUN: llvm-objdump -d %t.rv32 | FileCheck %s
 # RUN: llvm-objdump -d %t.rv64 | FileCheck %s
 # CHECK:      37 05 00 00     lui     a0, 0
 # CHECK-NEXT: 13 05 05 00     mv      a0, a0
 # CHECK-NEXT: 23 20 a5 00     sw      a0, 0(a0)
 # CHECK-NEXT: b7 05 00 00     lui     a1, 0
 # CHECK-NEXT: 93 85 a5 02     addi    a1, a1, 42
 # CHECK-NEXT: 23 a5 b5 02     sw      a1, 42(a1)
 
-# RUN: ld.lld %t.rv32.o --defsym foo=0x7ffff7ff --defsym bar=0x7ffff800 -o %t.rv32.limits
-# RUN: ld.lld %t.rv64.o --defsym foo=0x7ffff7ff --defsym bar=0xffffffff7ffff800 -o %t.rv64.limits
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=0x7ffff7ff --defsym bar=0x7ffff800 -o %t.rv32.limits
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=0x7ffff7ff --defsym bar=0xffffffff7ffff800 -o %t.rv64.limits
 # RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
 # RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
 # LIMITS:      37 f5 ff 7f     lui     a0, 524287
 # LIMITS-NEXT: 13 05 f5 7f     addi    a0, a0, 2047
 # LIMITS-NEXT: a3 2f a5 7e     sw      a0, 2047(a0)
 # LIMITS-NEXT: b7 05 00 80     lui     a1, 524288
 # LIMITS-NEXT: 93 85 05 80     addi    a1, a1, -2048
 # LIMITS-NEXT: 23 a0 b5 80     sw      a1, -2048(a1)
 
-# RUN: not ld.lld %t.rv64.o --defsym foo=0x7ffff800 --defsym bar=0xffffffff7ffff7ff -o /dev/null 2>&1 | FileCheck --check-prefix ERROR %s
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=0x7ffff800 --defsym bar=0xffffffff7ffff7ff -o /dev/null 2>&1 | FileCheck --check-prefix ERROR %s
 # ERROR: relocation R_RISCV_HI20 out of range: 524288 is not in [-524288, 524287]; references foo
 # ERROR: relocation R_RISCV_HI20 out of range: -524289 is not in [-524288, 524287]; references bar
 
 .global _start
 
 _start:
     lui     a0, %hi(foo)
     addi    a0, a0, %lo(foo)
     sw      a0, %lo(foo)(a0)
     lui     a1, %hi(bar)
     addi    a1, a1, %lo(bar)
     sw      a1, %lo(bar)(a1)

lld/test/ELF/riscv-ifunc-nonpreemptible.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
-# RUN: ld.lld -pie %t.32.o -o %t.32
-# RUN: ld.lld -pie %t.32.o -o %t.32-apply --apply-dynamic-relocs
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32-apply --apply-dynamic-relocs
 # RUN: llvm-readobj -r -x .got.plt %t.32 | FileCheck --check-prefixes=RELOC32,NO-APPLY-RELOC32 %s
 # RUN: llvm-readobj -r -x .got.plt %t.32-apply | FileCheck --check-prefixes=RELOC32,APPLY-RELOC32 %s
 # RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM32 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefix=DIS32 %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
-# RUN: ld.lld -pie %t.64.o -o %t.64
-# RUN: ld.lld -pie %t.64.o -o %t.64-apply --apply-dynamic-relocs
+# RUN: %lld_rv64 -pie %t.64.o -o %t.64
+# RUN: %lld_rv64 -pie %t.64.o -o %t.64-apply --apply-dynamic-relocs
 # RUN: llvm-readobj -r -x .got.plt %t.64 | FileCheck --check-prefixes=RELOC64,NO-APPLY-RELOC64 %s
 # RUN: llvm-readobj -r -x .got.plt %t.64-apply | FileCheck --check-prefixes=RELOC64,APPLY-RELOC64 %s
 # RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM64 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefix=DIS64 %s
 
 # RELOC32:      .rela.dyn {
 # RELOC32-NEXT:   0x3220 R_RISCV_IRELATIVE - 0x117C
 # RELOC32-NEXT: }

lld/test/ELF/riscv-jal.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
 # RUN: llvm-objdump -d %t.rv32 | FileCheck %s --check-prefix=CHECK-32
 # RUN: llvm-objdump -d %t.rv64 | FileCheck %s --check-prefix=CHECK-64
 # CHECK-32: 6f 00 40 00    j   0x110b8
 # CHECK-32: ef f0 df ff    jal 0x110b4
 # CHECK-64: 6f 00 40 00    j   0x11124
 # CHECK-64: ef f0 df ff    jal 0x11120
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv32.limits
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv64.limits
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv32.limits
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv64.limits
 # RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS-32 %s
 # RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS-64 %s
 # LIMITS-32:      6f f0 ff 7f j   0x1110b2
 # LIMITS-32-NEXT: ef 00 00 80 jal 0xfff110b8
 # LIMITS-64:      6f f0 ff 7f j   0x11111e
 # LIMITS-64-NEXT: ef 00 00 80 jal 0xfffffffffff11124
 
-# RUN: not ld.lld %t.rv32.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not %lld_rv32 %t.rv32.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
 # ERROR-RANGE: relocation R_RISCV_JAL out of range: 524288 is not in [-524288, 524287]; references foo
 # ERROR-RANGE: relocation R_RISCV_JAL out of range: -524289 is not in [-524288, 524287]; references bar
 
-# RUN: not ld.lld %t.rv32.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not %lld_rv32 %t.rv32.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
 # ERROR-ALIGN: improper alignment for relocation R_RISCV_JAL: 0x1 is not aligned to 2 bytes
 # ERROR-ALIGN: improper alignment for relocation R_RISCV_JAL: 0x3 is not aligned to 2 bytes
 
 .global _start
 
 _start:
     jal x0, foo
     jal x1, bar

lld/test/ELF/riscv-pcrel-hilo-error.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
-# RUN: not ld.lld %t.o --defsym external=0 2>&1 | FileCheck %s
+# RUN: not %lld_rv64 %t.o --defsym external=0 2>&1 | FileCheck %s
 
 # CHECK: error: R_RISCV_PCREL_LO12 relocation points to an absolute symbol: external
 
 # We provide a dummy %pcrel_hi referred to by external to appease the
 # assembler, but make external weak so --defsym can still override it at link
 # time.
 .weak external
 external:
 auipc sp,%pcrel_hi(external)
 addi sp,sp,%pcrel_lo(external)

lld/test/ELF/riscv-pcrel-hilo.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv32 | FileCheck %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv64 | FileCheck %s
-# RUN: ld.lld -pie %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
-# RUN: ld.lld -pie %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
+# RUN: %lld_rv32 -pie %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
+# RUN: %lld_rv64 -pie %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv32 | FileCheck %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv64 | FileCheck %s
 # CHECK:      auipc   a0, 0
 # CHECK-NEXT: addi    a0, a0, 12
 # CHECK-NEXT: sw      zero, 12(a0)
 # CHECK:      auipc   a0, 0
 # CHECK-NEXT: addi    a0, a0, -12
 # CHECK-NEXT: sw      zero, -12(a0)
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv32.limits
-# RUN: ld.lld %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv64.limits
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv32.limits
+# RUN: %lld_rv64 %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv64.limits
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
 # LIMITS:      auipc   a0, 524287
 # LIMITS-NEXT: addi    a0, a0, 2047
 # LIMITS-NEXT: sw      zero, 2047(a0)
 # LIMITS:      auipc   a0, 524288
 # LIMITS-NEXT: addi    a0, a0, -2048
 # LIMITS-NEXT: sw      zero, -2048(a0)
 
-# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o %t
-# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
+# RUN: %lld_rv32 %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o %t
+# RUN: not %lld_rv64 %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
 # ERROR: relocation R_RISCV_PCREL_HI20 out of range: 524288 is not in [-524288, 524287]; references foo
 # ERROR: relocation R_RISCV_PCREL_HI20 out of range: -524289 is not in [-524288, 524287]; references bar
 
 .global _start
 _start:
     auipc   a0, %pcrel_hi(foo)
     addi    a0, a0, %pcrel_lo(_start)
     sw      x0, %pcrel_lo(_start)(a0)
 .L1:
     auipc   a0, %pcrel_hi(bar)
     addi    a0, a0, %pcrel_lo(.L1)
     sw      x0, %pcrel_lo(.L1)(a0)

lld/test/ELF/riscv-plt.s

 # REQUIRES: riscv
 # RUN: echo '.globl bar, weak; .type bar,@function; .type weak,@function; bar: weak:' > %t1.s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %t1.s -o %t1.32.o
-# RUN: ld.lld -shared %t1.32.o -soname=t1.32.so -o %t1.32.so
+# RUN: %lld_rv32 -shared %t1.32.o -soname=t1.32.so -o %t1.32.so
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
-# RUN: ld.lld %t.32.o %t1.32.so -z separate-code -o %t.32
+# RUN: %lld_rv32 %t.32.o %t1.32.so -z separate-code -o %t.32
 # RUN: llvm-readelf -S -s %t.32 | FileCheck --check-prefixes=SEC,NM %s
 # RUN: llvm-readobj -r %t.32 | FileCheck --check-prefix=RELOC32 %s
 # RUN: llvm-readelf -x .got.plt %t.32 | FileCheck --check-prefix=GOTPLT32 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=DIS,DIS32 %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %t1.s -o %t1.64.o
-# RUN: ld.lld -shared %t1.64.o -soname=t1.64.so -o %t1.64.so
+# RUN: %lld_rv64 -shared %t1.64.o -soname=t1.64.so -o %t1.64.so
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
-# RUN: ld.lld %t.64.o %t1.64.so -z separate-code -o %t.64
+# RUN: %lld_rv64 %t.64.o %t1.64.so -z separate-code -o %t.64
 # RUN: llvm-readelf -S -s %t.64 | FileCheck --check-prefixes=SEC,NM %s
 # RUN: llvm-readobj -r %t.64 | FileCheck --check-prefix=RELOC64 %s
 # RUN: llvm-readelf -x .got.plt %t.64 | FileCheck --check-prefix=GOTPLT64 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=DIS,DIS64 %s
 
 # SEC: .plt PROGBITS {{0*}}00011030
 
 ## A canonical PLT has a non-zero st_value. bar and weak are called but their

lld/test/ELF/riscv-reloc-64-pic.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
-# RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: not %lld_rv64 -shared %t.o -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: error: relocation R_RISCV_32 cannot be used against symbol 'a'
 
 .globl a
 
 .data
 .long a

lld/test/ELF/riscv-reloc-add.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+relax %s -o %t.32.o
-# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32
 # RUN: llvm-readelf -x .rodata %t.32 | FileCheck --check-prefix=HEX %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+relax %s -o %t.64.o
-# RUN: ld.lld -shared %t.64.o -o %t.64
+# RUN: %lld_rv64 -shared %t.64.o -o %t.64
 # RUN: llvm-readelf -x .rodata %t.64 | FileCheck --check-prefix=HEX %s
 
 # HEX:      section '.rodata':
 # HEX-NEXT: 0x{{[0-9a-f]+}} 04000000 00000000 04000000 040004
 
 ## R_RISCV_ADD* and R_RISCV_SUB* are link-time constants, otherwise they are
 ## not allowed in -pie/-shared mode.
 

lld/test/ELF/riscv-reloc-copy.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %p/Inputs/relocation-copy.s -o %t1.o
-# RUN: ld.lld -shared %t1.o -soname=t1.so -o %t1.so
+# RUN: %lld_rv32 -shared %t1.o -soname=t1.so -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
-# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: %lld_rv32 %t.o %t1.so -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefixes=REL,REL32 %s
 # RUN: llvm-nm -S %t | FileCheck --check-prefix=NM32 %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %p/Inputs/relocation-copy.s -o %t1.o
-# RUN: ld.lld -shared %t1.o -soname=t1.so -o %t1.so
+# RUN: %lld_rv64 -shared %t1.o -soname=t1.so -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
-# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: %lld_rv64 %t.o %t1.so -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefixes=REL,REL64 %s
 # RUN: llvm-nm -S %t | FileCheck --check-prefix=NM64 %s
 
 # REL:        .rela.dyn {
 # REL32-NEXT:   0x13210 R_RISCV_COPY x 0x0
 # REL64-NEXT:   0x13360 R_RISCV_COPY x 0x0
 # REL-NEXT:   }
 
 # NM32: 00013210 00000004 B x
 # NM64: 0000000000013360 0000000000000004 B x
 
 la a0, x

lld/test/ELF/riscv-reloc-got.s

 # REQUIRES: riscv
 # RUN: echo '.globl b; b:' | llvm-mc -filetype=obj -triple=riscv32 - -o %t1.o
-# RUN: ld.lld -shared %t1.o -soname=t1.so -o %t1.so
+# RUN: %lld_rv32 -shared %t1.o -soname=t1.so -o %t1.so
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -position-independent %s -o %t.o
-# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: %lld_rv32 %t.o %t1.so -o %t
 # RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC32 %s
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC32 %s
 # RUN: llvm-nm %t | FileCheck --check-prefix=NM32 %s
 # RUN: llvm-readobj -x .got %t | FileCheck --check-prefix=HEX32 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=DIS32 %s
 
 # RUN: echo '.globl b; b:' | llvm-mc -filetype=obj -triple=riscv64 - -o %t1.o
-# RUN: ld.lld -shared %t1.o -soname=t1.so -o %t1.so
+# RUN: %lld_rv64 -shared %t1.o -soname=t1.so -o %t1.so
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -position-independent %s -o %t.o
-# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: %lld_rv64 %t.o %t1.so -o %t
 # RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC64 %s
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC64 %s
 # RUN: llvm-nm %t | FileCheck --check-prefix=NM64 %s
 # RUN: llvm-readobj -x .got %t | FileCheck --check-prefix=HEX64 %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=DIS64 %s
 
 # SEC32: .got PROGBITS         0001220c 00020c 00000c
 # SEC64: .got PROGBITS 0000000000012358 000358 000018
 
 # RELOC32:      .rela.dyn {
 # RELOC32-NEXT:   0x12210 R_RISCV_32 b 0x0
 # RELOC32-NEXT: }
 
 # RELOC64:      .rela.dyn {
 # RELOC64-NEXT:   0x12360 R_RISCV_64 b 0x0
 # RELOC64-NEXT: }
 
 # NM32: 00013218 d a
 # NM64: 0000000000013370 d a
 
 ## .got[0] = _DYNAMIC
 ## .got[1] = 0 (relocated by R_RISCV_32/64 at runtime)
 ## .got[2] = a (filled at link time)
 # HEX32: section '.got':
-# HEX32: 0x0001220c ac210100 00000000 18320100 
+# HEX32: 0x0001220c ac210100 00000000 18320100
 
 # HEX64: section '.got':
 # HEX64: 0x00012358 98220100 00000000 00000000 00000000
 # HEX64: 0x00012368 70330100 00000000
 
 ## &.got[2]-. = 0x12214-0x1119c = 4096*1+120
 # DIS32:      1119c: auipc a0, 1
 # DIS32-NEXT:        lw a0, 120(a0)

lld/test/ELF/riscv-tls-gd.s

 # REQUIRES: riscv
 # RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' > %t.s
 # RUN: echo '.globl __tls_get_addr; __tls_get_addr:' > %tga.s
 
 ## RISC-V psABI doesn't specify TLS relaxation. Though the code sequences are not
 ## relaxed, dynamic relocations can be omitted for GD->LE relaxation.
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %t.s -o %t1.32.o
-# RUN: ld.lld -shared -soname=t1.so %t1.32.o -o %t1.32.so
+# RUN: %lld_rv32 -shared -soname=t1.so %t1.32.o -o %t1.32.so
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %tga.s -o %tga.32.o
 ## rv32 GD
-# RUN: ld.lld -shared %t.32.o %t1.32.o -o %t.32.so
+# RUN: %lld_rv32 -shared %t.32.o %t1.32.o -o %t.32.so
 # RUN: llvm-readobj -r %t.32.so | FileCheck --check-prefix=GD32-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefix=GD32 %s
 ## rv32 GD -> LE
-# RUN: ld.lld %t.32.o %t1.32.o %tga.32.o -o %t.32
+# RUN: %lld_rv32 %t.32.o %t1.32.o %tga.32.o -o %t.32
 # RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
-# RUN: ld.lld -pie %t.32.o %t1.32.o %tga.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o %t1.32.o %tga.32.o -o %t.32
 # RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
 ## rv32 GD -> IE
-# RUN: ld.lld %t.32.o %t1.32.so %tga.32.o -o %t.32
+# RUN: %lld_rv32 %t.32.o %t1.32.so %tga.32.o -o %t.32
 # RUN: llvm-readobj -r %t.32 | FileCheck --check-prefix=IE32-REL %s
 # RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=IE32-GOT %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %t.s -o %t1.64.o
-# RUN: ld.lld -shared -soname=t1.so %t1.64.o -o %t1.64.so
+# RUN: %lld_rv64 -shared -soname=t1.so %t1.64.o -o %t1.64.so
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %tga.s -o %tga.64.o
 ## rv64 GD
-# RUN: ld.lld -shared %t.64.o %t1.64.o -o %t.64.so
+# RUN: %lld_rv64 -shared %t.64.o %t1.64.o -o %t.64.so
 # RUN: llvm-readobj -r %t.64.so | FileCheck --check-prefix=GD64-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefix=GD64 %s
 ## rv64 GD -> LE
-# RUN: ld.lld %t.64.o %t1.64.o %tga.64.o -o %t.64
+# RUN: %lld_rv64 %t.64.o %t1.64.o %tga.64.o -o %t.64
 # RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
-# RUN: ld.lld -pie %t.64.o %t1.64.o %tga.64.o -o %t.64
+# RUN: %lld_rv64 -pie %t.64.o %t1.64.o %tga.64.o -o %t.64
 # RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
 ## rv64 GD -> IE
-# RUN: ld.lld %t.64.o %t1.64.so %tga.64.o -o %t.64
+# RUN: %lld_rv64 %t.64.o %t1.64.so %tga.64.o -o %t.64
 # RUN: llvm-readobj -r %t.64 | FileCheck --check-prefix=IE64-REL %s
 # RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=IE64-GOT %s
 
 # GD32-REL:      .rela.dyn {
 # GD32-REL-NEXT:   0x2314 R_RISCV_TLS_DTPMOD32 a 0x0
 # GD32-REL-NEXT:   0x2318 R_RISCV_TLS_DTPREL32 a 0x0
 # GD32-REL-NEXT:   0x231C R_RISCV_TLS_DTPMOD32 b 0x0
 # GD32-REL-NEXT:   0x2320 R_RISCV_TLS_DTPREL32 b 0x0

lld/test/ELF/riscv-tls-ie.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
 ## rv32 IE
-# RUN: ld.lld -shared %t.32.o -o %t.32.so
+# RUN: %lld_rv32 -shared %t.32.o -o %t.32.so
 # RUN: llvm-readobj -r -d %t.32.so | FileCheck --check-prefix=IE32-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefixes=IE,IE32 %s
 ## rv32 IE -> LE
-# RUN: ld.lld %t.32.o -o %t.32
+# RUN: %lld_rv32 %t.32.o -o %t.32
 # RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE,LE32 %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
 ## rv64 IE
-# RUN: ld.lld -shared %t.64.o -o %t.64.so
+# RUN: %lld_rv64 -shared %t.64.o -o %t.64.so
 # RUN: llvm-readobj -r -d %t.64.so | FileCheck --check-prefix=IE64-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefixes=IE,IE64 %s
 ## rv64 IE -> LE
-# RUN: ld.lld %t.64.o -o %t.64
+# RUN: %lld_rv64 %t.64.o -o %t.64
 # RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE,LE64 %s
 
 # IE32-REL:      FLAGS STATIC_TLS
 # IE32-REL:      .rela.dyn {
 # IE32-REL-NEXT:   0x221C R_RISCV_TLS_TPREL32 - 0xC
 # IE32-REL-NEXT:   0x2218 R_RISCV_TLS_TPREL32 a 0x0

lld/test/ELF/riscv-tls-ld.s

 # REQUIRES: riscv
 # RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' > %t.s
 # RUN: echo '.globl __tls_get_addr; __tls_get_addr:' > %tga.s
 
 ## RISC-V psABI doesn't specify TLS relaxation. Though the code sequences are not
 ## relaxed, dynamic relocations can be omitted for LD->LE relaxation.
 ## LD uses the same relocation as GD: R_RISCV_GD_HI20, the difference is that it
 ## references a local symbol (.LANCHOR0).
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -position-independent %s -o %t.32.o
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %tga.s -o %tga.o
 ## rv32 LD
-# RUN: ld.lld -shared %t.32.o -o %t.32.so
+# RUN: %lld_rv32 -shared %t.32.o -o %t.32.so
 # RUN: llvm-readobj -r %t.32.so | FileCheck --check-prefix=LD32-REL %s
 # RUN: llvm-readelf -x .got %t.32.so | FileCheck --check-prefix=LD32-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefixes=LD,LD32 %s
 ## rv32 LD -> LE
-# RUN: ld.lld %t.32.o %tga.o -o %t.32
+# RUN: %lld_rv32 %t.32.o %tga.o -o %t.32
 # RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE,LE32 %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -position-independent %s -o %t.64.o
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %tga.s -o %tga.o
 ## rv64 LD
-# RUN: ld.lld -shared %t.64.o -o %t.64.so
+# RUN: %lld_rv64 -shared %t.64.o -o %t.64.so
 # RUN: llvm-readobj -r %t.64.so | FileCheck --check-prefix=LD64-REL %s
 # RUN: llvm-readelf -x .got %t.64.so | FileCheck --check-prefix=LD64-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefixes=LD,LD64 %s
 ## rv64 LD -> LE
-# RUN: ld.lld %t.64.o %tga.o -o %t.64
+# RUN: %lld_rv64 %t.64.o %tga.o -o %t.64
 # RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE,LE64 %s
 
 ## a@dtprel = st_value(a)-0x800 = 0xfffff808 is a link-time constant.
 # LD32-REL:      .rela.dyn {
 # LD32-REL-NEXT:   0x22AC
 # LD32-REL-NEXT:   0x22B0 R_RISCV_TLS_DTPMOD32 - 0x0

lld/test/ELF/riscv-tls-le.s

 # REQUIRES: riscv
 
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
-# RUN: ld.lld %t.32.o -o %t.32
+# RUN: %lld_rv32 %t.32.o -o %t.32
 # RUN: llvm-nm -p %t.32 | FileCheck --check-prefixes=NM %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE %s
-# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: %lld_rv32 -pie %t.32.o -o %t.32
 # RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
-# RUN: ld.lld %t.64.o -o %t.64
+# RUN: %lld_rv64 %t.64.o -o %t.64
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE %s
-# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: %lld_rv64 -pie %t.64.o -o %t.64
 # RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE %s
 
-# RUN: not ld.lld -shared %t.32.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
+# RUN: not %lld_rv32 -shared %t.32.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
 
 # ERR: error: relocation R_RISCV_TPREL_HI20 against .LANCHOR0 cannot be used with -shared
 # ERR: error: relocation R_RISCV_TPREL_LO12_I against .LANCHOR0 cannot be used with -shared
 # ERR: error: relocation R_RISCV_TPREL_HI20 against a cannot be used with -shared
 # ERR: error: relocation R_RISCV_TPREL_LO12_S against a cannot be used with -shared
 
 # NM: {{0*}}00000008 b .LANCHOR0
 # NM: {{0*}}0000000c B a

lld/test/ELF/riscv-undefined-weak.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
 # RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=RELOC %s
 
-# RUN: ld.lld -e absolute %t.o -o %t
+# RUN: %lld_rv64 -e absolute %t.o -o %t
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=CHECK,PC %s
 # RUN: llvm-readelf -x .data %t | FileCheck --check-prefixes=HEX %s
 
-# RUN: ld.lld -e absolute %t.o -o %t --export-dynamic
+# RUN: %lld_rv64 -e absolute %t.o -o %t --export-dynamic
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=CHECK,PLT %s
 # RUN: llvm-readelf -x .data %t | FileCheck --check-prefixes=HEX %s
 
 .weak target
 .global absolute, relative, branch
 
 ## Absolute relocations are resolved to 0.
 # RELOC:      0x0 R_RISCV_HI20 target 0x1

lld/test/ELF/riscv32-reloc-32-pic.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
-# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: %lld_rv32 -shared %t.o -o %t.so
 # RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOC %s
 
 ## R_RISCV_32 is an absolute relocation type.
 ## In PIC mode, it creates a relative relocation if the symbol is non-preemptable.
 
 # NM: 000031fc d b
 

lld/test/ELF/riscv64-reloc-64-pic.s

 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
-# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: %lld_rv64 -shared %t.o -o %t.so
 # RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOC %s
 
 ## R_RISCV_64 is an absolute relocation type.
 ## In PIC mode, it creates a relative relocation if the symbol is non-preemptable.
 
 # NM: 0000000000003350 d b