diff options
| author | Petar Jovanovic <petar.jovanovic@imgtec.com> | 2015-06-08 14:10:23 +0000 |
|---|---|---|
| committer | Petar Jovanovic <petar.jovanovic@imgtec.com> | 2015-06-08 14:10:23 +0000 |
| commit | cf197f0bdee1ea4af8cfd3853421de94943f0b1c (patch) | |
| tree | df9e7f6b97309d225d635df6fed56841698e3f59 | |
| parent | 00d9f8457bf49884c441492fe807b5409de98c8a (diff) | |
| download | bcm5719-llvm-cf197f0bdee1ea4af8cfd3853421de94943f0b1c.tar.gz bcm5719-llvm-cf197f0bdee1ea4af8cfd3853421de94943f0b1c.zip | |
[Mips64][mcjit] Add R_MIPS_PC32 relocation
This patch adds R_MIPS_PC32 relocation for Mips64.
Patch by Vladimir Radosavljevic.
Differential Revision: http://reviews.llvm.org/D10235
llvm-svn: 239301
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/ExecutionEngine/RuntimeDyld/Mips/ELF_Mips64r2N64_PIC_relocations.s | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index 720b7b22933..b4a34e8acf3 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -631,6 +631,10 @@ RuntimeDyldELF::evaluateMIPS64Relocation(const SectionEntry &Section, uint64_t FinalAddress = (Section.LoadAddress + Offset); return ((Value + Addend - FinalAddress - 4) >> 2) & 0xffff; } + case ELF::R_MIPS_PC32: { + uint64_t FinalAddress = (Section.LoadAddress + Offset); + return Value + Addend - FinalAddress; + } case ELF::R_MIPS_PC18_S3: { uint64_t FinalAddress = (Section.LoadAddress + Offset); return ((Value + Addend - ((FinalAddress | 7) ^ 7)) >> 3) & 0x3ffff; @@ -669,6 +673,7 @@ void RuntimeDyldELF::applyMIPS64Relocation(uint8_t *TargetPtr, break; case ELF::R_MIPS_32: case ELF::R_MIPS_GPREL32: + case ELF::R_MIPS_PC32: writeBytesUnaligned(CalculatedValue & 0xffffffff, TargetPtr, 4); break; case ELF::R_MIPS_64: diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/Mips/ELF_Mips64r2N64_PIC_relocations.s b/llvm/test/ExecutionEngine/RuntimeDyld/Mips/ELF_Mips64r2N64_PIC_relocations.s index d59d1350f39..1d8d293a26a 100644 --- a/llvm/test/ExecutionEngine/RuntimeDyld/Mips/ELF_Mips64r2N64_PIC_relocations.s +++ b/llvm/test/ExecutionEngine/RuntimeDyld/Mips/ELF_Mips64r2N64_PIC_relocations.s @@ -2,6 +2,15 @@ # RUN: llc -mtriple=mips64el-unknown-linux -relocation-model=pic -filetype=obj -o %T/test_ELF_ExternalFunction_Mips64N64.o %S/Inputs/ExternalFunction.ll # RUN: llvm-rtdyld -triple=mips64el-unknown-linux -verify -map-section test_ELF_Mips64N64.o,.text=0x1000 -map-section test_ELF_ExternalFunction_Mips64N64.o,.text=0x10000 -check=%s %/T/test_ELF_Mips64N64.o %T/test_ELF_ExternalFunction_Mips64N64.o + .data +# Test R_MIPS_PC32 relocation. +# rtdyld-check: *{4}(R_MIPS_PC32) = (foo - R_MIPS_PC32)[31:0] +R_MIPS_PC32: + .word foo-. +# rtdyld-check: *{4}(R_MIPS_PC32 + 4) = (foo - tmp1)[31:0] +tmp1: + .4byte foo-tmp1 + .text .abicalls .section .mdebug.abi64,"",@progbits |
