From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 12 Aug 2016 21:56:12 +0000 (+0000)
Subject: gold: add a cast to appease std::max NFC
X-Git-Tag: llvmorg-4.0.0-rc1~12541
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bc85613f7cd157e499a9c849321973ed7e07216;p=platform%2Fupstream%2Fllvm.git

gold: add a cast to appease std::max NFC

llvm-svn: 278567
---

diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index 7f38a02..ecc7527 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -626,7 +626,8 @@ static void addModule(LTO &Lto, claimed_file &F, const void *View) {
         CommonRes.Prevailing = true;
         CommonRes.VisibleToRegularObj = R.VisibleToRegularObj;
       }
-      CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize());
+      CommonRes.Size = std::max(CommonRes.Size,
+                                static_cast<uint64_t>(ObjSym.getCommonSize()));
       CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment());
       R.Prevailing = false;
     }