[llvm] r313668 - Revert "ExecutionEngine: add R_AARCH64_ABS{16,32}"

Saleem Abdulrasool via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 19 13:35:25 PDT 2017


Author: compnerd
Date: Tue Sep 19 13:35:25 2017
New Revision: 313668

URL: http://llvm.org/viewvc/llvm-project?rev=313668&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
    llvm/trunk/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s

Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=313668&r1=313667&r2=313668&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Tue Sep 19 13:35:25 2017
@@ -354,18 +354,6 @@ void RuntimeDyldELF::resolveAArch64Reloc
   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;

Modified: llvm/trunk/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s?rev=313668&r1=313667&r2=313668&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s (original)
+++ llvm/trunk/test/ExecutionEngine/RuntimeDyld/AArch64/ELF_ARM64_relocations.s Tue Sep 19 13:35:25 2017
@@ -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




More information about the llvm-commits mailing list