summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-01-09 11:20:35 +0000
committerPavel Labath <labath@google.com>2017-01-09 11:20:35 +0000
commitd338381077ea396b4f72f7be28db749d55a04a26 (patch)
treeae8366dbe46e2e8a03452b46141d0a5327536be4 /llvm/lib
parentc941e7d21bb9a3134d8de71bb0d3cd791e3e4a21 (diff)
downloadbcm5719-llvm-d338381077ea396b4f72f7be28db749d55a04a26.tar.gz
bcm5719-llvm-d338381077ea396b4f72f7be28db749d55a04a26.zip
Fix MSVC build failure introduced in r291431
MSVC does not like to reinterpret_cast to a uint64_t. Use a different cast instead. llvm-svn: 291435
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index 953d4cbe90e..8f6b1849169 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -917,12 +917,11 @@ bool RuntimeDyldELF::resolveAArch64ShortBranch(
return false;
const auto &SymInfo = Loc->second;
- Address = reinterpret_cast<uint64_t>(
- Sections[SymInfo.getSectionID()].getLoadAddressWithOffset(
+ Address =
+ uint64_t(Sections[SymInfo.getSectionID()].getLoadAddressWithOffset(
SymInfo.getOffset()));
} else {
- Address =
- reinterpret_cast<uint64_t>(Sections[Value.SectionID].getLoadAddress());
+ Address = uint64_t(Sections[Value.SectionID].getLoadAddress());
}
uint64_t Offset = RelI->getOffset();
uint64_t SourceAddress = Sections[SectionID].getLoadAddressWithOffset(Offset);
OpenPOWER on IntegriCloud