diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-09-20 21:32:44 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-09-20 21:32:44 +0000 |
| commit | 562630a1feb92e3f6854056364b18e29eefa0ecd (patch) | |
| tree | a9fec4d69a2cafcc71dfde04fec5e6ca81d98b88 | |
| parent | 043086504dfeb805ab7bfc401cafa624e6cff3fd (diff) | |
| download | bcm5719-llvm-562630a1feb92e3f6854056364b18e29eefa0ecd.tar.gz bcm5719-llvm-562630a1feb92e3f6854056364b18e29eefa0ecd.zip | |
Revert "Revert "ExecutionEngine: add R_AARCH64_ABS{16,32}""
This reverts commit SVN r313668. The original test case attempted to
write a pointer value into 16-bits, although the value may exceed the
range representable in 16-bits. Ensure that the symbol is located in
the address space such that its absolute address is representable in
16-bits. This should fix the assertion failure that was seen on the
Windows hosts.
llvm-svn: 313822
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 12 | ||||
| -rw-r--r-- | llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s | 15 |
2 files changed, 25 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index defe64e4445..a079d95a50f 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -354,6 +354,18 @@ void RuntimeDyldELF::resolveAArch64Relocation(const SectionEntry &Section, default: llvm_unreachable("Relocation type not implemented yet!"); break; + case ELF::R_AARCH64_ABS16: { + uint64_t Result = Value + Addend; + assert(static_cast<int64_t>(Result) >= INT16_MIN && Result < UINT16_MAX); + write(isBE, TargetPtr, static_cast<uint16_t>(Result & 0xffffU)); + break; + } + case ELF::R_AARCH64_ABS32: { + uint64_t Result = Value + Addend; + assert(static_cast<int64_t>(Result) >= INT32_MIN && Result < UINT32_MAX); + write(isBE, TargetPtr, static_cast<uint32_t>(Result & 0xffffffffU)); + break; + } case ELF::R_AARCH64_ABS64: write(isBE, TargetPtr, Value + Addend); break; diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s b/llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s index e0015a2b23f..eb0eb83672e 100644 --- a/llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s +++ b/llvm/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s @@ -1,6 +1,6 @@ # RUN: llvm-mc -triple=arm64-none-linux-gnu -filetype=obj -o %t %s -# RUN: llvm-rtdyld -triple=arm64-none-linux-gnu -verify -dummy-extern f=0x0123456789abcdef -check=%s %t - +# RUN: llvm-rtdyld -triple=arm64-none-linux-gnu -verify -dummy-extern f=0x0123456789abcdef -dummy-extern symbol=0xf00f -check=%s %t + .globl Q .section .dummy, "ax" Q: @@ -82,3 +82,14 @@ r: ## f & 0xFFF = 0xdef (bits 11:0 of f) ## 0xdef << 10 = 0x37bc00 # rtdyld-check: *{4}(a) = 0x9137bc00 + + .data +ABS16: + .short symbol +# rtdyld-check: (*{2}ABS16) = symbol[15:0] +ABS32: + .long symbol +# rtdyld-check: (*{4}ABS32) = symbol[31:0] +ABS64: + .xword symbol +# rtdyld-check: (*{8}ABS64) = symbol |
