diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-12 21:56:12 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-12 21:56:12 +0000 |
| commit | 0bc85613f7cd157e499a9c849321973ed7e07216 (patch) | |
| tree | 337693b56b86ab319f7d7c65d94ed231444633a3 /llvm/tools/gold | |
| parent | 358657f27edf9b2eebf1cc12a4daf47c97eaab33 (diff) | |
| download | bcm5719-llvm-0bc85613f7cd157e499a9c849321973ed7e07216.tar.gz bcm5719-llvm-0bc85613f7cd157e499a9c849321973ed7e07216.zip | |
gold: add a cast to appease std::max NFC
llvm-svn: 278567
Diffstat (limited to 'llvm/tools/gold')
| -rw-r--r-- | llvm/tools/gold/gold-plugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp index 7f38a021a0a..ecc7527cb7e 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; } |
