[llvm] r181128 - Fix buildbot failure on 64 bit linux due to std::max() having different

[Richard Osborne]

Author: friedgold
Date: Sat May  4 12:41:01 2013
New Revision: 181128

URL: http://llvm.org/viewvc/llvm-project?rev=181128&view=rev
Log:
Fix buildbot failure on 64 bit linux due to std::max() having different
operand types.

Modified:
    llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp

Modified: llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp?rev=181128&r1=181127&r2=181128&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp Sat May  4 12:41:01 2013
@@ -248,7 +248,7 @@ LowerGlobalAddress(SDValue Op, Selection
   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.