OSDN Git Service

Fix buildbot failure on 64 bit linux due to std::max() having different
authorRichard Osborne <richard@xmos.com>
Sat, 4 May 2013 17:41:01 +0000 (17:41 +0000)
committerRichard Osborne <richard@xmos.com>
Sat, 4 May 2013 17:41:01 +0000 (17:41 +0000)
operand types.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181128 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/XCore/XCoreISelLowering.cpp

index dfa8ad7..2d27f1a 100644 (file)
@@ -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.