diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -69,7 +69,7 @@ "too many errors emitted, stopping now" " (use /errorlimit:0 to see all errors)"; errorHandler().exitEarly = canExitEarly; - enableColors(stderrOS.has_colors()); + stderrOS.enable_colors(stderrOS.has_colors()); lld::stdoutOS = &stdoutOS; lld::stderrOS = &stderrOS; diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp --- a/lld/COFF/DriverUtils.cpp +++ b/lld/COFF/DriverUtils.cpp @@ -773,15 +773,15 @@ if (!arg) return; if (arg->getOption().getID() == OPT_color_diagnostics) { - enableColors(true); + lld::errs().enable_colors(true); } else if (arg->getOption().getID() == OPT_no_color_diagnostics) { - enableColors(false); + lld::errs().enable_colors(false); } else { StringRef s = arg->getValue(); if (s == "always") - enableColors(true); + lld::errs().enable_colors(true); else if (s == "never") - enableColors(false); + lld::errs().enable_colors(false); else if (s != "auto") error("unknown option: --color-diagnostics=" + s); } diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp --- a/lld/Common/ErrorHandler.cpp +++ b/lld/Common/ErrorHandler.cpp @@ -51,8 +51,6 @@ return handler; } -void lld::enableColors(bool enable) { lld::errs().enable_colors(enable); } - void lld::exitLld(int val) { // Delete any temporary file, while keeping the memory mapping open. if (errorHandler().outputBuffer) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -82,7 +82,7 @@ "too many errors emitted, stopping now (use " "-error-limit=0 to see all errors)"; errorHandler().exitEarly = canExitEarly; - enableColors(stderrOS.has_colors()); + stderrOS.enable_colors(stderrOS.has_colors()); lld::stdoutOS = &stdoutOS; lld::stderrOS = &stderrOS; diff --git a/lld/ELF/DriverUtils.cpp b/lld/ELF/DriverUtils.cpp --- a/lld/ELF/DriverUtils.cpp +++ b/lld/ELF/DriverUtils.cpp @@ -59,15 +59,15 @@ if (!arg) return; if (arg->getOption().getID() == OPT_color_diagnostics) { - enableColors(true); + lld::errs().enable_colors(true); } else if (arg->getOption().getID() == OPT_no_color_diagnostics) { - enableColors(false); + lld::errs().enable_colors(false); } else { StringRef s = arg->getValue(); if (s == "always") - enableColors(true); + lld::errs().enable_colors(true); else if (s == "never") - enableColors(false); + lld::errs().enable_colors(false); else if (s != "auto") error("unknown option: --color-diagnostics=" + s); } diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp --- a/lld/MinGW/Driver.cpp +++ b/lld/MinGW/Driver.cpp @@ -161,7 +161,7 @@ // then call coff::link. bool mingw::link(ArrayRef argsArr, bool canExitEarly, raw_ostream &stdoutOS, raw_ostream &stderrOS) { - enableColors(stderrOS.has_colors()); + stderrOS.enable_colors(stderrOS.has_colors()); lld::stdoutOS = &stdoutOS; lld::stderrOS = &stderrOS; diff --git a/lld/include/lld/Common/ErrorHandler.h b/lld/include/lld/Common/ErrorHandler.h --- a/lld/include/lld/Common/ErrorHandler.h +++ b/lld/include/lld/Common/ErrorHandler.h @@ -117,8 +117,6 @@ /// Returns the default error handler. ErrorHandler &errorHandler(); -void enableColors(bool enable); - inline void error(const Twine &msg) { errorHandler().error(msg); } inline LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &msg) { errorHandler().fatal(msg); diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -1150,7 +1150,7 @@ "too many errors emitted, stopping now (use " "'-error-limit 0' to see all errors)"; errorHandler().exitEarly = CanExitEarly; - enableColors(StderrOS.has_colors()); + StderrOS.enable_colors(StderrOS.has_colors()); lld::stdoutOS = &StdoutOS; lld::stderrOS = &StderrOS; diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp --- a/lld/wasm/Driver.cpp +++ b/lld/wasm/Driver.cpp @@ -84,7 +84,7 @@ errorHandler().errorLimitExceededMsg = "too many errors emitted, stopping now (use " "-error-limit=0 to see all errors)"; - enableColors(stderrOS.has_colors()); + stderrOS.enable_colors(stderrOS.has_colors()); lld::stdoutOS = &stdoutOS; lld::stderrOS = &stderrOS; @@ -135,15 +135,15 @@ if (!arg) return; if (arg->getOption().getID() == OPT_color_diagnostics) { - enableColors(true); + lld::errs().enable_colors(true); } else if (arg->getOption().getID() == OPT_no_color_diagnostics) { - enableColors(false); + lld::errs().enable_colors(false); } else { StringRef s = arg->getValue(); if (s == "always") - enableColors(true); + lld::errs().enable_colors(true); else if (s == "never") - enableColors(false); + lld::errs().enable_colors(false); else if (s != "auto") error("unknown option: --color-diagnostics=" + s); }