Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit ea7c4e1

Browse files
committed
Remove Config->Verbose because we have errorHandler().Verbose.
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@324684 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 2bb057d commit ea7c4e1

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ELF/AArch64ErrataFix.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
555555
if (RelIt != IS->Relocations.end() && RelIt->Type == R_AARCH64_JUMP26)
556556
return;
557557

558-
if (Config->Verbose)
558+
559+
if (errorHandler().Verbose)
559560
message("detected cortex-a53-843419 erratum sequence starting at " +
560561
utohexstr(AdrpAddr) + " in unpatched output.");
561562

ELF/Config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ struct Configuration {
150150
bool Target1Rel;
151151
bool Trace;
152152
bool UndefinedVersion;
153-
bool Verbose;
154153
bool WarnCommon;
155154
bool WarnMissingEntry;
156155
bool WriteAddends;

ELF/Driver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,10 @@ static int parseInt(StringRef S, opt::Arg *Arg) {
591591

592592
// Initializes Config members by the command line options.
593593
void LinkerDriver::readConfigs(opt::InputArgList &Args) {
594+
errorHandler().Verbose = Args.hasArg(OPT_verbose);;
595+
errorHandler().FatalWarnings =
596+
Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
597+
594598
Config->AllowMultipleDefinition =
595599
Args.hasFlag(OPT_allow_multiple_definition,
596600
OPT_no_allow_multiple_definition, false) ||
@@ -615,8 +619,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
615619
Config->Entry = Args.getLastArgValue(OPT_entry);
616620
Config->ExportDynamic =
617621
Args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
618-
errorHandler().FatalWarnings =
619-
Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
620622
Config->FilterList = args::getStrings(Args, OPT_filter);
621623
Config->Fini = Args.getLastArgValue(OPT_fini, "_fini");
622624
Config->FixCortexA53Errata843419 = Args.hasArg(OPT_fix_cortex_a53_843419);
@@ -674,8 +676,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
674676
Config->UndefinedVersion =
675677
Args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true);
676678
Config->UnresolvedSymbols = getUnresolvedSymbolPolicy(Args);
677-
Config->Verbose = Args.hasArg(OPT_verbose);
678-
errorHandler().Verbose = Config->Verbose;
679679
Config->WarnCommon = Args.hasFlag(OPT_warn_common, OPT_no_warn_common, false);
680680
Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
681681
Config->ZExecstack = hasZOption(Args, "execstack");

ELF/ICF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ template <class ELFT> void ICF<ELFT>::run() {
425425
log("ICF needed " + Twine(Cnt) + " iterations");
426426

427427
auto Print = [&](const Twine &Prefix, size_t I) {
428-
if (!Config->Verbose && !Config->PrintIcfSections)
428+
if (!Config->PrintIcfSections && !errorHandler().Verbose)
429429
return;
430430
std::string Filename =
431431
Sections[I]->File ? Sections[I]->File->getName() : "<internal>";

0 commit comments

Comments
 (0)