summaryrefslogtreecommitdiffstats
path: root/lld/ELF/InputFiles.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2017-01-06 10:04:08 +0000
committerRui Ueyama <ruiu@google.com>2017-01-06 10:04:08 +0000
commitce039266c11a521f6702f413e04875c29d340822 (patch)
tree15f5bf2b921192ed4c5b10b6cbbf3e4e4b8ad579 /lld/ELF/InputFiles.cpp
parentdac6169214760886e974b622eda38c25af353fcb (diff)
downloadbcm5719-llvm-ce039266c11a521f6702f413e04875c29d340822.tar.gz
bcm5719-llvm-ce039266c11a521f6702f413e04875c29d340822.zip
Merge elf::toString and coff::toString.
The two overloaded functions hid each other. This patch merges them. llvm-svn: 291222
Diffstat (limited to 'lld/ELF/InputFiles.cpp')
-rw-r--r--lld/ELF/InputFiles.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 522f9603b5e..bd9f25873c8 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -96,7 +96,7 @@ std::string elf::ObjectFile<ELFT>::getLineInfo(InputSectionBase<ELFT> *S,
}
// Returns "(internal)", "foo.a(bar.o)" or "baz.o".
-std::string elf::toString(const InputFile *F) {
+std::string lld::toString(const InputFile *F) {
if (!F)
return "(internal)";
if (!F->ArchiveName.empty())
OpenPOWER on IntegriCloud