Use the standard error handling mechanism in MinGW driver.

[ruiu]

Summary

Use the standard error handling mechanism in MinGW driver.

lld/trunk/MinGW/Driver.cpp

 //===- MinGW/Driver.cpp ---------------------------------------------------===//
 //
 //                             The LLVM Linker
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// GNU ld style linker driver for COFF currently supporting mingw-w64.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "lld/Common/Driver.h"
+#include "lld/Common/ErrorHandler.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
 #include <unistd.h>
 #endif
 
 using namespace lld;
 using namespace llvm;
 
-LLVM_ATTRIBUTE_NORETURN static void error(const Twine &Msg) {
-  errs() << Msg << "\n";
-  exit(1);
-}
-
 // Create OptTable
 enum {
   OPT_INVALID = 0,
 #define OPTION(_1, _2, ID, _4, _5, _6, _7, _8, _9, _10, _11, _12) OPT_##ID,
 #include "Options.inc"
 #undef OPTION
 };
 

 opt::InputArgList MinGWOptTable::parse(ArrayRef<const char *> Argv) {
   unsigned MissingIndex;
   unsigned MissingCount;
 
   SmallVector<const char *, 256> Vec(Argv.data(), Argv.data() + Argv.size());
   opt::InputArgList Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
 
   if (MissingCount)
-    error(StringRef(Args.getArgString(MissingIndex)) + ": missing argument");
+    fatal(StringRef(Args.getArgString(MissingIndex)) + ": missing argument");
   for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    error("unknown argument: " + Arg->getSpelling());
+    fatal("unknown argument: " + Arg->getSpelling());
   if (!Args.hasArg(OPT_INPUT) && !Args.hasArg(OPT_l))
-    error("no input files");
+    fatal("no input files");
   return Args;
 }
 
 // Find a file by concatenating given paths.
 static Optional<std::string> findFile(StringRef Path1, const Twine &Path2) {
   SmallString<128> S;
   sys::path::append(S, Path1, Path2);
   if (sys::fs::exists(S))
     return S.str().str();
   return None;
 }
 
 // This is for -lfoo. We'll look for libfoo.dll.a or libfoo.a from search paths.
 static std::string
 searchLibrary(StringRef Name, ArrayRef<StringRef> SearchPaths, bool BStatic) {
   if (Name.startswith(":")) {
     for (StringRef Dir : SearchPaths)
       if (Optional<std::string> S = findFile(Dir, Name.substr(1)))
         return *S;
-    error("unable to find library -l" + Name);
+    fatal("unable to find library -l" + Name);
   }
 
   for (StringRef Dir : SearchPaths) {
     if (!BStatic)
       if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".dll.a"))
         return *S;
     if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".a"))
       return *S;
   }
-  error("unable to find library -l" + Name);
+  fatal("unable to find library -l" + Name);
 }
 
 // Convert Unix-ish command line arguments to Windows-ish ones and
 // then call coff::link.
 bool mingw::link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) {
   MinGWOptTable Parser;
   opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
 
bool mingw::link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) {
 
   if (auto *A = Args.getLastArg(OPT_icf)) {
     StringRef S = A->getValue();
     if (S == "all")
       Add("-opt:icf");
     else if (S == "safe" || S == "none")
       Add("-opt:noicf");
     else
-      error("unknown parameter: --icf=" + S);
+      fatal("unknown parameter: --icf=" + S);
   } else {
     Add("-opt:noicf");
   }
 
   if (auto *A = Args.getLastArg(OPT_m)) {
     StringRef S = A->getValue();
     if (S == "i386pe")
       Add("-machine:x86");
     else if (S == "i386pep")
       Add("-machine:x64");
     else if (S == "thumb2pe")
       Add("-machine:arm");
     else if (S == "arm64pe")
       Add("-machine:arm64");
     else
-      error("unknown parameter: -m" + S);
+      fatal("unknown parameter: -m" + S);
   }
 
   for (auto *A : Args.filtered(OPT_mllvm))
     Add("-mllvm:" + StringRef(A->getValue()));
 
   for (auto *A : Args.filtered(OPT_Xlink))
     Add(A->getValue());