OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[lld] Fix win7 failure on adding InputGraph functionality 

llvm-svn: 188961
This commit is contained in:
Shankar Easwaran 2013-08-21 23:13:22 +00:00
parent 019c5905df
commit c4dba32d19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/include/lld/Driver/GnuLDInputGraph.h
View File

@ -26,8 +26,8 @@ namespace lld {
class ELFFileNode : public FileNode { class ELFFileNode : public FileNode {
public: public:
ELFFileNode(ELFLinkingContext &ctx, StringRef path, ELFFileNode(ELFLinkingContext &ctx, StringRef path,
bool isWholeArchive = false, bool asNeeded = false, std::vector<StringRef> searchPath,
std::vector<StringRef> searchPath = { "" }) bool isWholeArchive = false, bool asNeeded = false)
: FileNode(path), _elfLinkingContext(ctx), : FileNode(path), _elfLinkingContext(ctx),
_isWholeArchive(isWholeArchive), _asNeeded(asNeeded) { _isWholeArchive(isWholeArchive), _asNeeded(asNeeded) {
std::copy(searchPath.begin(), searchPath.end(), std::copy(searchPath.begin(), searchPath.end(),

4
lld/lib/Driver/GnuLdDriver.cpp
View File

@ -270,8 +270,8 @@ bool GnuLdDriver::parse(int argc, const char *argv[],
case OPT_l: { case OPT_l: {
std::unique_ptr<InputElement> inputFile = std::unique_ptr<InputElement> inputFile =
std::move(std::unique_ptr<InputElement>( std::move(std::unique_ptr<InputElement>(
new ELFFileNode(*ctx, inputArg->getValue(), isWholeArchive, new ELFFileNode(*ctx, inputArg->getValue(), searchPath,
asNeeded, searchPath))); isWholeArchive, asNeeded)));
if (controlNodeStack.empty()) if (controlNodeStack.empty())
inputGraph->addInputElement(std::move(inputFile)); inputGraph->addInputElement(std::move(inputFile));
else else