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 | 2f75a0c0d8bdb8828e76bbff06d689ce0cc0d58e (patch) | |
| tree | 22739bfaeacd50a65b66de5cbd10d0265b637ba2 | |
| parent | 0a7abb655bd2b6990c35507aefc280d721ec822a (diff) | |
| download | llvm-2f75a0c0d8bdb8828e76bbff06d689ce0cc0d58e.zip llvm-2f75a0c0d8bdb8828e76bbff06d689ce0cc0d58e.tar.gz llvm-2f75a0c0d8bdb8828e76bbff06d689ce0cc0d58e.tar.bz2 | |
Fix buildbot failure on 64 bit linux due to std::max() having different
operand types.
llvm-svn: 181128
| -rw-r--r-- | llvm/lib/Target/XCore/XCoreISelLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/XCore/XCoreISelLowering.cpp b/llvm/lib/Target/XCore/XCoreISelLowering.cpp index dfa8ad7..2d27f1a 100644 --- a/llvm/lib/Target/XCore/XCoreISelLowering.cpp +++ b/llvm/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. |