diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-14 05:07:20 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-14 05:07:20 +0000 |
commit | 5724bf57e101e98f82fce9e0693e2035562c8e34 (patch) | |
tree | 76f7bc76ccbf59f11fd9942ec220563954eb7efa /tools/gold | |
parent | 12fc2327af85f1ccecf1164fa8a81a5c59ba4250 (diff) |
Revert "gold: add a cast to appease std::max NFC"
This was fixed differently by Teresa and this should no longer be needed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@278622 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/gold')
-rw-r--r-- | tools/gold/gold-plugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index ecc7527cb7e2..7f38a021a0ad 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -626,8 +626,7 @@ static void addModule(LTO &Lto, claimed_file &F, const void *View) { CommonRes.Prevailing = true; CommonRes.VisibleToRegularObj = R.VisibleToRegularObj; } - CommonRes.Size = std::max(CommonRes.Size, - static_cast<uint64_t>(ObjSym.getCommonSize())); + CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize()); CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment()); R.Prevailing = false; } |