Skip to content
This repository has been archived by the owner on Feb 5, 2019. It is now read-only.

Commit

Permalink
Partially revert r308329 to fix MSVC
Browse files Browse the repository at this point in the history
This is an attempt to fix an upstream bug at
https://bugs.llvm.org/show_bug.cgi?id=36096 by applying the local solution found
there and otherwise reverting the behavior that seems to be causing problems for
us. I'm not actually sure what's going on here, but hopefully it's not too bad
for us...
  • Loading branch information
alexcrichton committed Jan 28, 2018
1 parent 5c54c25 commit 9eb9267
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/Object/ArchiveWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,7 @@ static bool isArchiveSymbol(const object::BasicSymbolRef &S) {
return false;
if (!(Symflags & object::SymbolRef::SF_Global))
return false;
if (Symflags & object::SymbolRef::SF_Undefined &&
!(Symflags & object::SymbolRef::SF_Indirect))
if (Symflags & object::SymbolRef::SF_Undefined)
return false;
return true;
}
Expand Down

0 comments on commit 9eb9267

Please sign in to comment.