From 3a6eaef3ccd5810e72dd520c98bb1c609f8a525b Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 19 Sep 2017 20:35:25 +0000 Subject: [PATCH] Revert "ExecutionEngine: add R_AARCH64_ABS{16,32}" This reverts commit SVN r313654. Seems that it is triggering an assertion on Windows specifically. Revert until I can build on Windows and look into what is happening there. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313668 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 12 ------------ .../RuntimeDyld/AArch64/ELF_ARM64_relocations.s | 13 ------------- 2 files changed, 25 deletions(-) diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index a079d95a50f..defe64e4445 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -354,18 +354,6 @@ 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(Result) >= INT16_MIN && Result < UINT16_MAX); - write(isBE, TargetPtr, static_cast(Result & 0xffffU)); - break; - } - case ELF::R_AARCH64_ABS32: { - uint64_t Result = Value + Addend; - assert(static_cast(Result) >= INT32_MIN && Result < UINT32_MAX); - write(isBE, TargetPtr, static_cast(Result & 0xffffffffU)); - break; - } case ELF::R_AARCH64_ABS64: write(isBE, TargetPtr, Value + Addend); break; diff --git a/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s b/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s index 53535c7fe4a..e0015a2b23f 100644 --- a/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s +++ b/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s @@ -82,16 +82,3 @@ r: ## f & 0xFFF = 0xdef (bits 11:0 of f) ## 0xdef << 10 = 0x37bc00 # rtdyld-check: *{4}(a) = 0x9137bc00 - - .data -laser: - .asciz "laser" -ABS16: - .short laser -# rtdyld-check: (*{2}ABS16) = laser[15:0] -ABS32: - .long laser -# rtdyld-check: (*{4}ABS32) = laser[31:0] -ABS64: - .xword laser -# rtdyld-check: (*{8}ABS64) = laser -- 2.40.0