diff options
| author | Rui Ueyama <ruiu@google.com> | 2013-10-08 05:23:03 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2013-10-08 05:23:03 +0000 |
| commit | 492048bf60c6f06bcc196eaf467e19626a7ee695 (patch) | |
| tree | 621001f99e615ac8146a8d0eb058ff509da9a154 | |
| parent | ec01cd6e7fbb6f24844514cb1c83d7dea93672b8 (diff) | |
| download | bcm5719-llvm-492048bf60c6f06bcc196eaf467e19626a7ee695.tar.gz bcm5719-llvm-492048bf60c6f06bcc196eaf467e19626a7ee695.zip | |
Rename GnuLd's path() too.
llvm-svn: 192169
| -rw-r--r-- | lld/include/lld/Driver/GnuLdInputGraph.h | 6 | ||||
| -rw-r--r-- | lld/lib/Driver/GnuLdDriver.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lld/include/lld/Driver/GnuLdInputGraph.h b/lld/include/lld/Driver/GnuLdInputGraph.h index cab3030f442..54f83ea2304 100644 --- a/lld/include/lld/Driver/GnuLdInputGraph.h +++ b/lld/include/lld/Driver/GnuLdInputGraph.h @@ -42,7 +42,7 @@ public: return a->kind() == InputElement::Kind::File; } - virtual llvm::ErrorOr<StringRef> path(const LinkingContext &ctx) const; + virtual ErrorOr<StringRef> getPath(const LinkingContext &ctx) const; /// \brief validates the Input Element virtual bool validate() { return true; } @@ -52,7 +52,7 @@ public: /// \brief Dump the Input Element virtual bool dump(raw_ostream &diagnostics) { - diagnostics << "Name : " << *path(_elfLinkingContext) << "\n"; + diagnostics << "Name : " << *getPath(_elfLinkingContext) << "\n"; diagnostics << "Type : " << "ELF File" << "\n"; @@ -72,7 +72,7 @@ public: /// \brief Parse the input file to lld::File. llvm::error_code parse(const LinkingContext &ctx, raw_ostream &diagnostics) { - ErrorOr<StringRef> filePath = path(ctx); + ErrorOr<StringRef> filePath = getPath(ctx); if (!filePath && error_code(filePath) == llvm::errc::no_such_file_or_directory) return make_error_code(llvm::errc::no_such_file_or_directory); diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp index 66e93e84055..b4363bbf03f 100644 --- a/lld/lib/Driver/GnuLdDriver.cpp +++ b/lld/lib/Driver/GnuLdDriver.cpp @@ -69,7 +69,7 @@ public: } // namespace -llvm::ErrorOr<StringRef> ELFFileNode::path(const LinkingContext &) const { +llvm::ErrorOr<StringRef> ELFFileNode::getPath(const LinkingContext &) const { if (!_isDashlPrefix) return _path; return _elfLinkingContext.searchLibrary(_path, _libraryPaths); |
