[lld] d0371f4 - Fix component build
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 18 18:26:15 PST 2019
Author: Rui Ueyama
Date: 2019-11-19T11:20:52+09:00
New Revision: d0371f473675ede1d79a615ec4fdf0cf5368944c
URL: https://github.com/llvm/llvm-project/commit/d0371f473675ede1d79a615ec4fdf0cf5368944c
DIFF: https://github.com/llvm/llvm-project/commit/d0371f473675ede1d79a615ec4fdf0cf5368944c.diff
LOG: Fix component build
b11386f9be9b2dc7276a758d64f66833da10bdea broke lld build
if `-DBUILD_SHARED_LIBS=ON` is passed to CMake.
Added:
Modified:
lld/lib/Core/Resolver.cpp
lld/lib/Core/SymbolTable.cpp
lld/lib/Driver/DarwinLdDriver.cpp
lld/lib/ReaderWriter/FileArchive.cpp
lld/lib/ReaderWriter/MachO/LayoutPass.cpp
lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
Removed:
################################################################################
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp
index 182f9caa9857..88119130852c 100644
--- a/lld/lib/Core/Resolver.cpp
+++ b/lld/lib/Core/Resolver.cpp
@@ -223,8 +223,8 @@ bool Resolver::resolveUndefines() {
if (!file)
return true;
if (std::error_code ec = file->parse()) {
- lld::errs() << "Cannot open " + file->path() << ": " << ec.message()
- << "\n";
+ llvm::errs() << "Cannot open " + file->path() << ": " << ec.message()
+ << "\n";
return false;
}
DEBUG_WITH_TYPE("resolver",
@@ -252,8 +252,8 @@ bool Resolver::resolveUndefines() {
if (auto EC = undefAddedOrError.takeError()) {
// FIXME: This should be passed to logAllUnhandledErrors but it needs
// to be passed a Twine instead of a string.
- lld::errs() << "Error in " + file->path() << ": ";
- logAllUnhandledErrors(std::move(EC), lld::errs(), std::string());
+ llvm::errs() << "Error in " + file->path() << ": ";
+ logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
return false;
}
undefAdded = undefAddedOrError.get();
@@ -266,8 +266,8 @@ bool Resolver::resolveUndefines() {
if (auto EC = undefAddedOrError.takeError()) {
// FIXME: This should be passed to logAllUnhandledErrors but it needs
// to be passed a Twine instead of a string.
- lld::errs() << "Error in " + file->path() << ": ";
- logAllUnhandledErrors(std::move(EC), lld::errs(), std::string());
+ llvm::errs() << "Error in " + file->path() << ": ";
+ logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
return false;
}
undefAdded = undefAddedOrError.get();
@@ -279,8 +279,8 @@ bool Resolver::resolveUndefines() {
if (auto EC = handleSharedLibrary(*file)) {
// FIXME: This should be passed to logAllUnhandledErrors but it needs
// to be passed a Twine instead of a string.
- lld::errs() << "Error in " + file->path() << ": ";
- logAllUnhandledErrors(std::move(EC), lld::errs(), std::string());
+ llvm::errs() << "Error in " + file->path() << ": ";
+ logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
return false;
}
break;
@@ -424,14 +424,14 @@ bool Resolver::checkUndefines() {
// Seems like this symbol is undefined. Warn that.
foundUndefines = true;
if (_ctx.printRemainingUndefines()) {
- lld::errs() << "Undefined symbol: " << undef->file().path() << ": "
- << _ctx.demangle(undef->name()) << "\n";
+ llvm::errs() << "Undefined symbol: " << undef->file().path() << ": "
+ << _ctx.demangle(undef->name()) << "\n";
}
}
if (!foundUndefines)
return false;
if (_ctx.printRemainingUndefines())
- lld::errs() << "symbol(s) not found\n";
+ llvm::errs() << "symbol(s) not found\n";
return true;
}
diff --git a/lld/lib/Core/SymbolTable.cpp b/lld/lib/Core/SymbolTable.cpp
index 7ccd1ce0ab2c..3ce9555aa494 100644
--- a/lld/lib/Core/SymbolTable.cpp
+++ b/lld/lib/Core/SymbolTable.cpp
@@ -157,15 +157,15 @@ bool SymbolTable::addByName(const Atom &newAtom) {
useNew = true;
break;
}
- lld::errs() << "Size mismatch: " << existing->name() << " ("
- << existingSize << ") " << newAtom.name() << " (" << newSize
- << ")\n";
+ llvm::errs() << "Size mismatch: " << existing->name() << " ("
+ << existingSize << ") " << newAtom.name() << " (" << newSize
+ << ")\n";
LLVM_FALLTHROUGH;
}
case MCR_Error:
- lld::errs() << "Duplicate symbols: " << existing->name() << ":"
- << existing->file().path() << " and " << newAtom.name() << ":"
- << newAtom.file().path() << "\n";
+ llvm::errs() << "Duplicate symbols: " << existing->name() << ":"
+ << existing->file().path() << " and " << newAtom.name()
+ << ":" << newAtom.file().path() << "\n";
llvm::report_fatal_error("duplicate symbol error");
break;
}
@@ -187,7 +187,7 @@ bool SymbolTable::addByName(const Atom &newAtom) {
break;
}
case NCR_Error:
- lld::errs() << "SymbolTable: error while merging " << name << "\n";
+ llvm::errs() << "SymbolTable: error while merging " << name << "\n";
llvm::report_fatal_error("duplicate symbol error");
break;
}
diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp
index 60515d21a923..d372e6c94c59 100644
--- a/lld/lib/Driver/DarwinLdDriver.cpp
+++ b/lld/lib/Driver/DarwinLdDriver.cpp
@@ -232,7 +232,7 @@ static std::error_code parseOrderFile(StringRef orderFilePath,
sym = prefixAndSym.first;
if (!sym.empty()) {
ctx.appendOrderedSymbol(sym, prefix);
- // lld::errs() << sym << ", prefix=" << prefix << "\n";
+ // llvm::errs() << sym << ", prefix=" << prefix << "\n";
}
}
return std::error_code();
@@ -382,7 +382,7 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) {
!parsedArgs.getLastArg(OPT_test_file_usage)) {
// If no -arch and no options at all, print usage message.
if (parsedArgs.size() == 0) {
- table.PrintHelp(lld::outs(),
+ table.PrintHelp(llvm::outs(),
(std::string(args[0]) + " [options] file...").c_str(),
"LLVM Linker", false);
} else {
diff --git a/lld/lib/ReaderWriter/FileArchive.cpp b/lld/lib/ReaderWriter/FileArchive.cpp
index d73711cfb3d0..98f4d06ee210 100644
--- a/lld/lib/ReaderWriter/FileArchive.cpp
+++ b/lld/lib/ReaderWriter/FileArchive.cpp
@@ -145,7 +145,7 @@ class FileArchive : public lld::ArchiveLibraryFile {
+ mb.getBufferIdentifier() + ")").str();
if (_logLoading)
- lld::errs() << memberPath << "\n";
+ llvm::errs() << memberPath << "\n";
std::unique_ptr<MemoryBuffer> memberMB(MemoryBuffer::getMemBuffer(
mb.getBuffer(), mb.getBufferIdentifier(), false));
diff --git a/lld/lib/ReaderWriter/MachO/LayoutPass.cpp b/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
index ea54c2d4cc3b..775d3b0bad3a 100644
--- a/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
@@ -241,8 +241,8 @@ static bool compareAtomsSub(const LayoutPass::SortKey &lc,
return leftOrdinal < rightOrdinal;
}
- lld::errs() << "Unordered: <" << left->name() << "> <" << right->name()
- << ">\n";
+ llvm::errs() << "Unordered: <" << left->name() << "> <" << right->name()
+ << ">\n";
llvm_unreachable("Atoms with Same Ordinal!");
}
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index 812f89696f6f..221d895a40d0 100644
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -825,7 +825,7 @@ bool MachOLinkingContext::sectionAligned(StringRef seg, StringRef sect,
void MachOLinkingContext::addExportSymbol(StringRef sym) {
// Support old crufty export lists with bogus entries.
if (sym.endswith(".eh") || sym.startswith(".objc_category_name_")) {
- lld::errs() << "warning: ignoring " << sym << " in export list\n";
+ llvm::errs() << "warning: ignoring " << sym << " in export list\n";
return;
}
// Only i386 MacOSX uses old ABI, so don't change those.
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index 3e70a1db7b15..0163c90189fd 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -317,7 +317,7 @@ llvm::Error processSymboledSection(DefinedAtom::ContentType atomType,
// Debug logging of symbols.
// for (const Symbol *sym : symbols)
- // lld::errs() << " sym: "
+ // llvm::errs() << " sym: "
// << llvm::format("0x%08llx ", (uint64_t)sym->value)
// << ", " << sym->name << "\n";
More information about the llvm-commits
mailing list