Remove Config->Verbose because we have errorHandler().Verbose.

llvm-svn: 324684

4 files changed, 7 insertions, 7 deletions

diff --git a/lld/ELF/AArch64ErrataFix.cpp b/lld/ELF/AArch64ErrataFix.cpp
index 48273d0eb39..b8fc6439671 100644
--- a/lld/ELF/AArch64ErrataFix.cpp
+++ b/lld/ELF/AArch64ErrataFix.cpp
@@ -555,7 +555,8 @@ static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
   if (RelIt != IS->Relocations.end() && RelIt->Type == R_AARCH64_JUMP26)
     return;
 
-  if (Config->Verbose)
+
+  if (errorHandler().Verbose)
     message("detected cortex-a53-843419 erratum sequence starting at " +
             utohexstr(AdrpAddr) + " in unpatched output.");
 
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 4253399a323..21e81e48201 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -150,7 +150,6 @@ struct Configuration {
   bool Target1Rel;
   bool Trace;
   bool UndefinedVersion;
-  bool Verbose;
   bool WarnCommon;
   bool WarnMissingEntry;
   bool WriteAddends;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index b543bb16a9a..355271125e4 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -591,6 +591,10 @@ static int parseInt(StringRef S, opt::Arg *Arg) {
 
 // Initializes Config members by the command line options.
 void LinkerDriver::readConfigs(opt::InputArgList &Args) {
+  errorHandler().Verbose = Args.hasArg(OPT_verbose);;
+  errorHandler().FatalWarnings =
+      Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
+
   Config->AllowMultipleDefinition =
       Args.hasFlag(OPT_allow_multiple_definition,
                    OPT_no_allow_multiple_definition, false) ||
@@ -615,8 +619,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   Config->Entry = Args.getLastArgValue(OPT_entry);
   Config->ExportDynamic =
       Args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
-  errorHandler().FatalWarnings =
-      Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
   Config->FilterList = args::getStrings(Args, OPT_filter);
   Config->Fini = Args.getLastArgValue(OPT_fini, "_fini");
   Config->FixCortexA53Errata843419 = Args.hasArg(OPT_fix_cortex_a53_843419);
@@ -674,8 +676,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   Config->UndefinedVersion =
       Args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true);
   Config->UnresolvedSymbols = getUnresolvedSymbolPolicy(Args);
-  Config->Verbose = Args.hasArg(OPT_verbose);
-  errorHandler().Verbose = Config->Verbose;
   Config->WarnCommon = Args.hasFlag(OPT_warn_common, OPT_no_warn_common, false);
   Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
   Config->ZExecstack = hasZOption(Args, "execstack");
diff --git a/lld/ELF/ICF.cpp b/lld/ELF/ICF.cpp
index c87e432acdb..9ea9c48525b 100644
--- a/lld/ELF/ICF.cpp
+++ b/lld/ELF/ICF.cpp
@@ -425,7 +425,7 @@ template <class ELFT> void ICF<ELFT>::run() {
   log("ICF needed " + Twine(Cnt) + " iterations");
 
   auto Print = [&](const Twine &Prefix, size_t I) {
-    if (!Config->Verbose && !Config->PrintIcfSections)
+    if (!Config->PrintIcfSections && !errorHandler().Verbose)
       return;
     std::string Filename =
         Sections[I]->File ? Sections[I]->File->getName() : "<internal>";