maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld] Add comments to InputFiles::searchLibraries() arguments. 

llvm-svn: 181492
This commit is contained in:
Rui Ueyama 2013-05-08 23:54:10 +00:00
parent 4e8626f708
commit 60f5f30687
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lld/lib/Core/Resolver.cpp
View File

@ -200,7 +200,11 @@ void Resolver::resolveUndefines() {
StringRef undefName = undefAtom->name();
// load for previous undefine may also have loaded this undefine
if (!_symbolTable.isDefined(undefName)) {
_inputFiles.searchLibraries(undefName, true, true, false, *this);
_inputFiles.searchLibraries(undefName,
true, // searchSharedLibs
true, // searchArchives
false, // dataSymbolOnly
*this);
}
}
// search libraries for overrides of common symbols
@ -213,10 +217,13 @@ void Resolver::resolveUndefines() {
const Atom *curAtom = _symbolTable.findByName(tentDefName);
assert(curAtom != nullptr);
if (const DefinedAtom* curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
if (curDefAtom->merge() == DefinedAtom::mergeAsTentative ) {
if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
// Still tentative definition, so look for override.
_inputFiles.searchLibraries(tentDefName, searchSharedLibs,
searchArchives, true, *this);
_inputFiles.searchLibraries(tentDefName,
searchSharedLibs,
searchArchives,
true, // dataSymbolOnly
*this);
}
}
}