summaryrefslogtreecommitdiff
path: root/tools/gold
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2010-04-16 04:32:20 +0000
committerNick Lewycky <nicholas@mxc.ca>2010-04-16 04:32:20 +0000
commit4b67bc1e80a94ccceebda899e889e15c6c6c45ba (patch)
treea8f55ef03db2bb24d8a668aec32f51cccfab537c /tools/gold
parent107ae0ad8b8e8960a266f8128671b8e46b17a89c (diff)
downloadllvm-4b67bc1e80a94ccceebda899e889e15c6c6c45ba.tar.gz
llvm-4b67bc1e80a94ccceebda899e889e15c6c6c45ba.tar.bz2
llvm-4b67bc1e80a94ccceebda899e889e15c6c6c45ba.tar.xz
Revert r64616 which worked around http://gcc.gnu.org/PR42757 , we just didn't
know it at the time. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101439 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/gold')
-rw-r--r--tools/gold/gold-plugin.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index df5c5f7347..16e645f8da 100644
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -340,9 +340,7 @@ static ld_plugin_status all_symbols_read_hook(void) {
E = Modules.end(); I != E; ++I) {
(*get_symbols)(I->handle, I->syms.size(), &I->syms[0]);
for (unsigned i = 0, e = I->syms.size(); i != e; i++) {
- if (I->syms[i].resolution == LDPR_PREVAILING_DEF ||
- (I->syms[i].def == LDPK_COMMON &&
- I->syms[i].resolution == LDPR_RESOLVED_IR)) {
+ if (I->syms[i].resolution == LDPR_PREVAILING_DEF) {
lto_codegen_add_must_preserve_symbol(cg, I->syms[i].name);
anySymbolsPreserved = true;
@@ -387,7 +385,7 @@ static ld_plugin_status all_symbols_read_hook(void) {
(*message)(LDPL_ERROR, "%s", ErrMsg.c_str());
return LDPS_ERR;
}
- raw_fd_ostream *objFile =
+ raw_fd_ostream *objFile =
new raw_fd_ostream(uniqueObjPath.c_str(), ErrMsg,
raw_fd_ostream::F_Binary);
if (!ErrMsg.empty()) {