summaryrefslogtreecommitdiffstats
path: root/llvm/tools/gold/gold-plugin.cpp
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2016-08-14 05:07:20 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2016-08-14 05:07:20 +0000
commit98541b09f482af0233e29f01ca5019f74ec054e7 (patch)
tree4cbae3fa6dcfd80d75ebe7240fee95e3ff2e258c /llvm/tools/gold/gold-plugin.cpp
parent68be1eb885dd7cc47f534d5608cb9ddff5d722c3 (diff)
downloadbcm5719-llvm-98541b09f482af0233e29f01ca5019f74ec054e7.tar.gz
bcm5719-llvm-98541b09f482af0233e29f01ca5019f74ec054e7.zip
Revert "gold: add a cast to appease std::max NFC"
This was fixed differently by Teresa and this should no longer be needed. llvm-svn: 278622
Diffstat (limited to 'llvm/tools/gold/gold-plugin.cpp')
-rw-r--r--llvm/tools/gold/gold-plugin.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index ecc7527cb7e..7f38a021a0a 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud