diff options
| -rw-r--r-- | llvm/lib/Object/RelocationResolver.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/RISCV/relax-debug-frame.ll | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Object/RelocationResolver.cpp b/llvm/lib/Object/RelocationResolver.cpp index 97c69677f58..5a1052ffcde 100644 --- a/llvm/lib/Object/RelocationResolver.cpp +++ b/llvm/lib/Object/RelocationResolver.cpp @@ -336,6 +336,7 @@ static bool supportsRISCV(uint64_t Type) { switch (Type) { case ELF::R_RISCV_NONE: case ELF::R_RISCV_32: + case ELF::R_RISCV_32_PCREL: case ELF::R_RISCV_64: case ELF::R_RISCV_SET6: case ELF::R_RISCV_SUB6: @@ -360,6 +361,8 @@ static uint64_t resolveRISCV(RelocationRef R, uint64_t S, uint64_t A) { return A; case ELF::R_RISCV_32: return (S + RA) & 0xFFFFFFFF; + case ELF::R_RISCV_32_PCREL: + return (S + RA - R.getOffset()) & 0xFFFFFFFF; case ELF::R_RISCV_64: return S + RA; case ELF::R_RISCV_SET6: diff --git a/llvm/test/DebugInfo/RISCV/relax-debug-frame.ll b/llvm/test/DebugInfo/RISCV/relax-debug-frame.ll index 3fc4433c3af..24ba037762a 100644 --- a/llvm/test/DebugInfo/RISCV/relax-debug-frame.ll +++ b/llvm/test/DebugInfo/RISCV/relax-debug-frame.ll @@ -1,7 +1,7 @@ ; RUN: llc -filetype=obj -mtriple=riscv32 -mattr=+relax %s -o - \ ; RUN: | llvm-readobj -r | FileCheck -check-prefix=RELAX %s ; RUN: llc -filetype=obj -mtriple=riscv32 -mattr=+relax %s -o - \ -; RUN: | llvm-dwarfdump --debug-frame - \ +; RUN: | llvm-dwarfdump --debug-frame - 2>&1 \ ; RUN: | FileCheck -check-prefix=RELAX-DWARFDUMP %s ; ; RELAX: Section{{.*}}.rela.{{eh|debug}}_frame { @@ -15,6 +15,7 @@ ; RELAX: 0x39 R_RISCV_SET6 ; RELAX: 0x39 R_RISCV_SUB6 ; +; RELAX-DWARFDUMP-NOT: error: failed to compute relocation ; RELAX-DWARFDUMP: CIE ; RELAX-DWARFDUMP: DW_CFA_advance_loc ; RELAX-DWARFDUMP: DW_CFA_def_cfa_offset |
