diff options
| author | Eli Bendersky <eli.bendersky@intel.com> | 2012-01-16 09:31:10 +0000 |
|---|---|---|
| committer | Eli Bendersky <eli.bendersky@intel.com> | 2012-01-16 09:31:10 +0000 |
| commit | 1b0cd0f1b10aed90719ee2a788a85c96758a4447 (patch) | |
| tree | 66b3ddbd6d8254ed349b6e460500dc2663bea62f /llvm/lib/ExecutionEngine/RuntimeDyld | |
| parent | 4c647587b168b086e021dfea0b5f682df026bdd8 (diff) | |
| download | bcm5719-llvm-1b0cd0f1b10aed90719ee2a788a85c96758a4447.tar.gz bcm5719-llvm-1b0cd0f1b10aed90719ee2a788a85c96758a4447.zip | |
A fix for the previous commit: "integer constant is too large for ‘long’ type" error on some 32-bit bots
llvm-svn: 148232
Diffstat (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld')
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index 9ff95ff8b6e..54cb350552d 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -183,9 +183,9 @@ void RuntimeDyldELF::resolveX86_64Relocation(StringRef Name, case ELF::R_X86_64_32S: { uint64_t Value = reinterpret_cast<uint64_t>(Addr) + RE.Addend; // FIXME: Handle the possibility of this assertion failing - assert((RE.Type == ELF::R_X86_64_32 && !(Value & 0xFFFFFFFF00000000)) || + assert((RE.Type == ELF::R_X86_64_32 && !(Value & 0xFFFFFFFF00000000ULL)) || (RE.Type == ELF::R_X86_64_32S && - (Value & 0xFFFFFFFF00000000) == 0xFFFFFFFF00000000)); + (Value & 0xFFFFFFFF00000000ULL) == 0xFFFFFFFF00000000ULL)); uint32_t TruncatedAddr = (Value & 0xFFFFFFFF); uint32_t *Target = reinterpret_cast<uint32_t*>(TargetAddr); *Target = TruncatedAddr; |
