diff options
| author | Richard Osborne <richard@xmos.com> | 2013-05-04 17:41:01 +0000 |
|---|---|---|
| committer | Richard Osborne <richard@xmos.com> | 2013-05-04 17:41:01 +0000 |
| commit | 7153a30610e78c5cd1347a31f3a90dde2f335f37 (patch) | |
| tree | 33eab29beea11f0f3d54900b3d000159ca1ab0f1 /lib/Target/XCore/XCoreISelLowering.cpp | |
| parent | 43c7abee14b08b4d8595e634f2fd91be79327ccb (diff) | |
| download | llvm-7153a30610e78c5cd1347a31f3a90dde2f335f37.tar.gz llvm-7153a30610e78c5cd1347a31f3a90dde2f335f37.tar.bz2 llvm-7153a30610e78c5cd1347a31f3a90dde2f335f37.tar.xz | |
Fix buildbot failure on 64 bit linux due to std::max() having different
operand types.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181128 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/XCore/XCoreISelLowering.cpp')
| -rw-r--r-- | lib/Target/XCore/XCoreISelLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/XCore/XCoreISelLowering.cpp b/lib/Target/XCore/XCoreISelLowering.cpp index dfa8ad732f..2d27f1a0f6 100644 --- a/lib/Target/XCore/XCoreISelLowering.cpp +++ b/lib/Target/XCore/XCoreISelLowering.cpp @@ -248,7 +248,7 @@ LowerGlobalAddress(SDValue Op, SelectionDAG &DAG) const const GlobalValue *GV = GN->getGlobal(); int64_t Offset = GN->getOffset(); // We can only fold positive offsets that are a multiple of the word size. - int64_t FoldedOffset = std::max(Offset & ~3, 0LL); + int64_t FoldedOffset = std::max(Offset & ~3, (int64_t)0); SDValue GA = DAG.getTargetGlobalAddress(GV, DL, MVT::i32, FoldedOffset); GA = getGlobalAddressWrapper(GA, GV, DAG); // Handle the rest of the offset. |