[lld] r188961 - [lld] Fix win7 failure on adding InputGraph functionality

Shankar Easwaran shankare at codeaurora.org
Wed Aug 21 16:13:22 PDT 2013


Author: shankare
Date: Wed Aug 21 18:13:22 2013
New Revision: 188961

URL: http://llvm.org/viewvc/llvm-project?rev=188961&view=rev
Log:
[lld] Fix win7 failure on adding InputGraph functionality

Modified:
    lld/trunk/include/lld/Driver/GnuLDInputGraph.h
    lld/trunk/lib/Driver/GnuLdDriver.cpp

Modified: lld/trunk/include/lld/Driver/GnuLDInputGraph.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/GnuLDInputGraph.h?rev=188961&r1=188960&r2=188961&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/GnuLDInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/GnuLDInputGraph.h Wed Aug 21 18:13:22 2013
@@ -26,8 +26,8 @@ namespace lld {
 class ELFFileNode : public FileNode {
 public:
   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),
         _isWholeArchive(isWholeArchive), _asNeeded(asNeeded) {
     std::copy(searchPath.begin(), searchPath.end(),

Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=188961&r1=188960&r2=188961&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Wed Aug 21 18:13:22 2013
@@ -270,8 +270,8 @@ bool GnuLdDriver::parse(int argc, const
     case OPT_l: {
       std::unique_ptr<InputElement> inputFile =
           std::move(std::unique_ptr<InputElement>(
-              new ELFFileNode(*ctx, inputArg->getValue(), isWholeArchive,
-                              asNeeded, searchPath)));
+              new ELFFileNode(*ctx, inputArg->getValue(), searchPath,
+                              isWholeArchive, asNeeded)));
       if (controlNodeStack.empty())
         inputGraph->addInputElement(std::move(inputFile));
       else





More information about the llvm-commits mailing list