summaryrefslogtreecommitdiffstats
path: root/lld/lib/Driver/DarwinLdDriver.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2014-12-10 00:33:00 +0000
committerRui Ueyama <ruiu@google.com>2014-12-10 00:33:00 +0000
commit00eb257f2e908e5ec81bbe00aeeb42ea4aa4fd79 (patch)
treeecd3def36561bcc8ade871e50674266fa47c7611 /lld/lib/Driver/DarwinLdDriver.cpp
parentf3108ce3e8fa2f6440810512d53d84ed869569fb (diff)
downloadbcm5719-llvm-00eb257f2e908e5ec81bbe00aeeb42ea4aa4fd79.tar.gz
bcm5719-llvm-00eb257f2e908e5ec81bbe00aeeb42ea4aa4fd79.zip
Re-commit r223330: Rewrite InputGraph's Group
llvm-svn: 223867
Diffstat (limited to 'lld/lib/Driver/DarwinLdDriver.cpp')
-rw-r--r--lld/lib/Driver/DarwinLdDriver.cpp6
1 files changed, 3 insertions, 3 deletions
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<DarwinInputGraph> &inputGraph,
+static void addFile(StringRef path, std::unique_ptr<InputGraph> &inputGraph,
MachOLinkingContext &ctx, bool loadWholeArchive,
bool upwardDylib) {
auto node = llvm::make_unique<MachOFileNode>(path, ctx);
@@ -185,7 +185,7 @@ static std::error_code parseOrderFile(StringRef orderFilePath,
// per line. The <dir> prefix is prepended to each partial path.
//
static std::error_code parseFileList(StringRef fileListPath,
- std::unique_ptr<DarwinInputGraph> &inputGraph,
+ std::unique_ptr<InputGraph> &inputGraph,
MachOLinkingContext &ctx, bool forceLoad,
raw_ostream &diagnostics) {
// If there is a comma, split off <dir>.
@@ -521,7 +521,7 @@ bool DarwinLdDriver::parse(int argc, const char *argv[],
}
}
- std::unique_ptr<DarwinInputGraph> inputGraph(new DarwinInputGraph());
+ std::unique_ptr<InputGraph> inputGraph(new InputGraph());
// Now construct the set of library search directories, following ld64's
// baroque set of accumulated hacks. Mostly, the algorithm constructs
OpenPOWER on IntegriCloud