diff options
| author |   Tom Stellard <thomas.stellard@amd.com> | 2015-05-07 22:09:33 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2015-05-07 22:09:33 +0000 |
| commit | 88aadd217c55baf4bb100d99ad6c3bf981107961 (patch) | |
| tree | 083b5e6cd3f4e24e3b084ce6a6a0d16baf389337 | |
| parent | Merging r235931: (diff) | |
| download | llvm-project-88aadd217c55baf4bb100d99ad6c3bf981107961.tar.gz llvm-project-88aadd217c55baf4bb100d99ad6c3bf981107961.tar.bz2 llvm-project-88aadd217c55baf4bb100d99ad6c3bf981107961.zip | |
Merging r234977:
------------------------------------------------------------------------
r234977 | lhames | 2015-04-15 00:46:01 -0400 (Wed, 15 Apr 2015) | 5 lines
[RuntimeDyld] Add casts to make delta computation 64-bit.
Hopefully this will fix the i686/msvc build failure described at:
http://bb.pgr.jp/builders/ninja-clang-i686-msc18-R/builds/803
------------------------------------------------------------------------
llvm-svn: 236784
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp index 2851e48e90d2..d75be2807862 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp @@ -243,7 +243,8 @@ unsigned char *RuntimeDyldMachOCRTPBase<Impl>::processFDE(unsigned char *P, } static int64_t computeDelta(SectionEntry *A, SectionEntry *B) { - int64_t ObjDistance = A->ObjAddress - B->ObjAddress; + int64_t ObjDistance = + static_cast<int64_t>(A->ObjAddress) - static_cast<int64_t>(B->ObjAddress); int64_t MemDistance = A->LoadAddress - B->LoadAddress; return ObjDistance - MemDistance; } |