Don't pass llvm::errs() all over the place. Diagnostics always go to stderr.

llvm-svn: 185657

1 files changed, 11 insertions, 12 deletions

diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp
index fb4d498000f..6af1593df6e 100644
--- a/lld/lib/Driver/UniversalDriver.cpp
+++ b/lld/lib/Driver/UniversalDriver.cpp
@@ -80,7 +80,7 @@ ProgramNameParts parseProgramName(StringRef programName) {
   return ret;
 }
 
-Flavor selectFlavor(std::vector<const char *> &args, raw_ostream &diag) {
+Flavor selectFlavor(std::vector<const char *> &args) {
   // -core as first arg is shorthand for -flavor core.
   if (args.size() > 1 && StringRef(args[1]) == "-core") {
     args.erase(args.begin() + 1);
@@ -92,7 +92,7 @@ Flavor selectFlavor(std::vector<const char *> &args, raw_ostream &diag) {
     args.erase(args.begin() + 1);
     args.erase(args.begin() + 1);
     if (flavor == Flavor::invalid)
-      diag << "error: '" << args[2] << "' invalid value for -flavor.\n";
+      llvm::errs() << "error: '" << args[2] << "' invalid value for -flavor.\n";
     return flavor;
   }
 
@@ -101,33 +101,32 @@ Flavor selectFlavor(std::vector<const char *> &args, raw_ostream &diag) {
 
   // If flavor still undetermined, then error out.
   if (flavor == Flavor::invalid)
-    diag << "error: failed to determine driver flavor from program name"
-         << " '" << args[0] << "'.\n"
-         << "select a flavor with -flavor [gnu|darwin|link|core].\n";
+    llvm::errs() << "error: failed to determine driver flavor from program name"
+                 << " '" << args[0] << "'.\n"
+                 << "select a flavor with -flavor [gnu|darwin|link|core].\n";
   return flavor;
 }
 }
 
 namespace lld {
-bool UniversalDriver::link(int argc, const char *argv[],
-                           raw_ostream &diagnostics) {
+bool UniversalDriver::link(int argc, const char *argv[]) {
   // Convert argv[] C-array to vector.
   std::vector<const char *> args(argv, argv + argc);
 
   // Determine flavor of link based on command name or -flavor argument.
   // Note: 'args' is modified to remove -flavor option.
-  Flavor flavor = selectFlavor(args, diagnostics);
+  Flavor flavor = selectFlavor(args);
 
   // Switch to appropriate driver.
   switch (flavor) {
   case Flavor::gnu_ld:
-    return GnuLdDriver::linkELF(args.size(), args.data(), diagnostics);
+    return GnuLdDriver::linkELF(args.size(), args.data());
   case Flavor::darwin_ld:
-    return DarwinLdDriver::linkMachO(args.size(), args.data(), diagnostics);
+    return DarwinLdDriver::linkMachO(args.size(), args.data());
   case Flavor::win_link:
-    return WinLinkDriver::linkPECOFF(args.size(), args.data(), diagnostics);
+    return WinLinkDriver::linkPECOFF(args.size(), args.data());
   case Flavor::core:
-    return CoreDriver::link(args.size(), args.data(), diagnostics);
+    return CoreDriver::link(args.size(), args.data());
   case Flavor::invalid:
     return true;
   }