From 00eb257f2e908e5ec81bbe00aeeb42ea4aa4fd79 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 10 Dec 2014 00:33:00 +0000 Subject: Re-commit r223330: Rewrite InputGraph's Group llvm-svn: 223867 --- lld/lib/Driver/DarwinLdDriver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lld/lib/Driver/DarwinLdDriver.cpp') diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp index 21cd691a578..6c80c5c8e65 100644 --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -83,7 +83,7 @@ static std::string canonicalizePath(StringRef path) { } } -static void addFile(StringRef path, std::unique_ptr &inputGraph, +static void addFile(StringRef path, std::unique_ptr &inputGraph, MachOLinkingContext &ctx, bool loadWholeArchive, bool upwardDylib) { auto node = llvm::make_unique(path, ctx); @@ -185,7 +185,7 @@ static std::error_code parseOrderFile(StringRef orderFilePath, // per line. The prefix is prepended to each partial path. // static std::error_code parseFileList(StringRef fileListPath, - std::unique_ptr &inputGraph, + std::unique_ptr &inputGraph, MachOLinkingContext &ctx, bool forceLoad, raw_ostream &diagnostics) { // If there is a comma, split off . @@ -521,7 +521,7 @@ bool DarwinLdDriver::parse(int argc, const char *argv[], } } - std::unique_ptr inputGraph(new DarwinInputGraph()); + std::unique_ptr inputGraph(new InputGraph()); // Now construct the set of library search directories, following ld64's // baroque set of accumulated hacks. Mostly, the algorithm constructs -- cgit v1.2.3