1 files changed, 22 insertions, 22 deletions

diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index ba3f36a81c2..c9d0249dc8f 100644
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -43,7 +43,7 @@ namespace coff {
 Configuration *Config;
 LinkerDriver *Driver;
 
-bool link(llvm::ArrayRef<const char *> Args) {
+bool link(ArrayRef<const char *> Args) {
   Config = make<Configuration>();
   Driver = make<LinkerDriver>();
   Driver->link(Args);
@@ -94,7 +94,7 @@ static bool isDecorated(StringRef Sym) {
 // Parses .drectve section contents and returns a list of files
 // specified by /defaultlib.
 void LinkerDriver::parseDirectives(StringRef S) {
-  llvm::opt::InputArgList Args = Parser.parse(S);
+  opt::InputArgList Args = Parser.parse(S);
 
   for (auto *Arg : Args) {
     switch (Arg->getOption().getID()) {
@@ -148,12 +148,12 @@ StringRef LinkerDriver::doFindFile(StringRef Filename) {
   bool HasExt = (Filename.find('.') != StringRef::npos);
   for (StringRef Dir : SearchPaths) {
     SmallString<128> Path = Dir;
-    llvm::sys::path::append(Path, Filename);
-    if (llvm::sys::fs::exists(Path.str()))
+    sys::path::append(Path, Filename);
+    if (sys::fs::exists(Path.str()))
       return Alloc.save(Path.str());
     if (!HasExt) {
       Path.append(".obj");
-      if (llvm::sys::fs::exists(Path.str()))
+      if (sys::fs::exists(Path.str()))
         return Alloc.save(Path.str());
     }
   }
@@ -254,7 +254,7 @@ static uint64_t getDefaultImageBase() {
   return Config->DLL ? 0x10000000 : 0x400000;
 }
 
-static std::string createResponseFile(const llvm::opt::InputArgList &Args,
+static std::string createResponseFile(const opt::InputArgList &Args,
                                       ArrayRef<MemoryBufferRef> MBs,
                                       ArrayRef<StringRef> SearchPaths) {
   SmallString<0> Data;
@@ -285,7 +285,7 @@ static std::string createResponseFile(const llvm::opt::InputArgList &Args,
   return Data.str();
 }
 
-static unsigned getDefaultDebugType(const llvm::opt::InputArgList &Args) {
+static unsigned getDefaultDebugType(const opt::InputArgList &Args) {
   unsigned DebugTypes = static_cast<unsigned>(DebugType::CV);
   if (Args.hasArg(OPT_driver))
     DebugTypes |= static_cast<unsigned>(DebugType::PData);
@@ -295,7 +295,7 @@ static unsigned getDefaultDebugType(const llvm::opt::InputArgList &Args) {
 }
 
 static unsigned parseDebugType(StringRef Arg) {
-  llvm::SmallVector<StringRef, 3> Types;
+  SmallVector<StringRef, 3> Types;
   Arg.split(Types, ',', /*KeepEmpty=*/false);
 
   unsigned DebugTypes = static_cast<unsigned>(DebugType::None);
@@ -307,7 +307,7 @@ static unsigned parseDebugType(StringRef Arg) {
   return DebugTypes;
 }
 
-void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
+void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   // If the first command line argument is "/lib", link.exe acts like lib.exe.
   // We call our own implementation of lib.exe that understands bitcode files.
   if (ArgsArr.size() > 1 && StringRef(ArgsArr[1]).equals_lower("/lib")) {
@@ -317,15 +317,15 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
   }
 
   // Needed for LTO.
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargets();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllAsmParsers();
-  llvm::InitializeAllAsmPrinters();
-  llvm::InitializeAllDisassemblers();
+  InitializeAllTargetInfos();
+  InitializeAllTargets();
+  InitializeAllTargetMCs();
+  InitializeAllAsmParsers();
+  InitializeAllAsmPrinters();
+  InitializeAllDisassemblers();
 
   // Parse command line options.
-  llvm::opt::InputArgList Args = Parser.parseLINK(ArgsArr.slice(1));
+  opt::InputArgList Args = Parser.parseLINK(ArgsArr.slice(1));
 
   // Handle /help
   if (Args.hasArg(OPT_help)) {
@@ -335,13 +335,13 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
 
   if (auto *Arg = Args.getLastArg(OPT_linkrepro)) {
     SmallString<64> Path = StringRef(Arg->getValue());
-    llvm::sys::path::append(Path, "repro");
+    sys::path::append(Path, "repro");
     ErrorOr<CpioFile *> F = CpioFile::create(Path);
     if (F)
       Cpio.reset(*F);
     else
-      llvm::errs() << "/linkrepro: failed to open " << Path
-                   << ".cpio: " << F.getError().message() << '\n';
+      errs() << "/linkrepro: failed to open " << Path
+             << ".cpio: " << F.getError().message() << '\n';
   }
 
   if (Args.filtered_begin(OPT_INPUT) == Args.filtered_end())
@@ -584,7 +584,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
             " conflicts with " + machineToStr(Config->Machine));
   }
   if (Config->Machine == IMAGE_FILE_MACHINE_UNKNOWN) {
-    llvm::errs() << "warning: /machine is not specified. x64 is assumed.\n";
+    errs() << "warning: /machine is not specified. x64 is assumed.\n";
     Config->Machine = AMD64;
   }
 
@@ -625,7 +625,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
       fatal("entry point must be defined");
     Config->Entry = addUndefined(S);
     if (Config->Verbose)
-      llvm::outs() << "Entry name inferred: " << S << "\n";
+      outs() << "Entry name inferred: " << S << "\n";
   }
 
   // Handle /export
@@ -765,7 +765,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
   // to help debugging.
   if (auto *Arg = Args.getLastArg(OPT_lldmap)) {
     std::error_code EC;
-    llvm::raw_fd_ostream Out(Arg->getValue(), EC, OpenFlags::F_Text);
+    raw_fd_ostream Out(Arg->getValue(), EC, OpenFlags::F_Text);
     if (EC)
       fatal(EC, "could not create the symbol map");
     Symtab.printMap(Out);