diff options
author | Rui Ueyama <ruiu@google.com> | 2019-07-12 06:12:27 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2019-07-12 06:12:27 +0000 |
commit | 332fc712c604612fa9a28354ebd48826ea4dc830 (patch) | |
tree | 3c561d5a9fadd097039ca5933d5190c80e36897f /lld | |
parent | 67ab269e1d7dc5952acf1e0817fa3a88080dae3e (diff) | |
download | bcm5719-llvm-332fc712c604612fa9a28354ebd48826ea4dc830.tar.gz bcm5719-llvm-332fc712c604612fa9a28354ebd48826ea4dc830.zip |
Fix odd variable names.
llvm-svn: 365875
Diffstat (limited to 'lld')
-rw-r--r-- | lld/COFF/Config.h | 2 | ||||
-rw-r--r-- | lld/COFF/Driver.cpp | 2 | ||||
-rw-r--r-- | lld/COFF/InputFiles.cpp | 2 | ||||
-rw-r--r-- | lld/COFF/MarkLive.cpp | 6 | ||||
-rw-r--r-- | lld/COFF/SymbolTable.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h index 6d9d6a848da..f7c80971476 100644 --- a/lld/COFF/Config.h +++ b/lld/COFF/Config.h @@ -113,7 +113,7 @@ struct Configuration { std::vector<llvm::StringRef> argv; // Symbols in this set are considered as live by the garbage collector. - std::vector<Symbol *> gCRoot; + std::vector<Symbol *> gcroot; std::set<std::string> noDefaultLibs; bool noDefaultLibAll = false; diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp index 0009296124e..d003937825b 100644 --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -497,7 +497,7 @@ Symbol *LinkerDriver::addUndefined(StringRef name) { Symbol *b = symtab->addUndefined(name); if (!b->isGCRoot) { b->isGCRoot = true; - config->gCRoot.push_back(b); + config->gcroot.push_back(b); } return b; } diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp index e28d07a718b..9936a6f69ff 100644 --- a/lld/COFF/InputFiles.cpp +++ b/lld/COFF/InputFiles.cpp @@ -832,7 +832,7 @@ void BitcodeFile::parse() { } symbols.push_back(sym); if (objSym.isUsed()) - config->gCRoot.push_back(sym); + config->gcroot.push_back(sym); } directives = obj->getCOFFLinkerOpts(); } diff --git a/lld/COFF/MarkLive.cpp b/lld/COFF/MarkLive.cpp index 0543d0ee2de..6d34cb864e3 100644 --- a/lld/COFF/MarkLive.cpp +++ b/lld/COFF/MarkLive.cpp @@ -15,13 +15,13 @@ namespace lld { namespace coff { -static Timer gCTimer("GC", Timer::root()); +static Timer gctimer("GC", Timer::root()); // Set live bit on for each reachable chunk. Unmarked (unreachable) // COMDAT chunks will be ignored by Writer, so they will be excluded // from the final output. void markLive(ArrayRef<Chunk *> chunks) { - ScopedTimer t(gCTimer); + ScopedTimer t(gctimer); // We build up a worklist of sections which have been marked as live. We only // push into the worklist when we discover an unmarked section, and we mark @@ -51,7 +51,7 @@ void markLive(ArrayRef<Chunk *> chunks) { }; // Add GC root chunks. - for (Symbol *b : config->gCRoot) + for (Symbol *b : config->gcroot) addSym(b); while (!worklist.empty()) { diff --git a/lld/COFF/SymbolTable.cpp b/lld/COFF/SymbolTable.cpp index a6c4bc57125..280a9c28892 100644 --- a/lld/COFF/SymbolTable.cpp +++ b/lld/COFF/SymbolTable.cpp @@ -293,7 +293,7 @@ void SymbolTable::reportRemainingUndefines() { if (undefs.empty() && localImports.empty()) return; - for (Symbol *b : config->gCRoot) { + for (Symbol *b : config->gcroot) { if (undefs.count(b)) errorOrWarn("<root>: undefined symbol: " + toString(*b)); if (config->warnLocallyDefinedImported) |