Update for llvm api change.

llvm-svn: 210919

9 files changed, 31 insertions, 24 deletions

diff --git a/lld/include/lld/Driver/CoreInputGraph.h b/lld/include/lld/Driver/CoreInputGraph.h
index 5859f24fd8e..d194b80239b 100644
--- a/lld/include/lld/Driver/CoreInputGraph.h
+++ b/lld/include/lld/Driver/CoreInputGraph.h
@@ -20,6 +20,7 @@
 #include "lld/Core/InputGraph.h"
 #include "lld/ReaderWriter/CoreLinkingContext.h"
 #include "lld/ReaderWriter/Reader.h"
+#include "llvm/Support/Errc.h"
 
 #include <map>
 #include <memory>
@@ -34,10 +35,9 @@ public:
   /// \brief Parse the input file to lld::File.
   std::error_code parse(const LinkingContext &ctx,
                         raw_ostream &diagnostics) override {
-    using std::make_error_code;
     ErrorOr<StringRef> filePath = getPath(ctx);
-    if (filePath.getError() == std::errc::no_such_file_or_directory)
-      return make_error_code(std::errc::no_such_file_or_directory);
+    if (filePath.getError() == llvm::errc::no_such_file_or_directory)
+      return make_error_code(llvm::errc::no_such_file_or_directory);
 
     // Create a memory buffer
     std::unique_ptr<MemoryBuffer> mb;
diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp
index 2b929ca6b8d..cd2619cf02b 100644
--- a/lld/lib/Driver/GnuLdDriver.cpp
+++ b/lld/lib/Driver/GnuLdDriver.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/ManagedStatic.h"
@@ -159,7 +160,7 @@ llvm::ErrorOr<StringRef> ELFFileNode::getPath(const LinkingContext &) const {
 }
 
 std::string ELFFileNode::errStr(std::error_code errc) {
-  if (errc == std::errc::no_such_file_or_directory) {
+  if (errc == llvm::errc::no_such_file_or_directory) {
     if (_attributes._isDashlPrefix)
       return (Twine("Unable to find library -l") + _path).str();
     return (Twine("Unable to find file ") + _path).str();
diff --git a/lld/lib/ReaderWriter/ELF/DefaultLayout.h b/lld/lib/ReaderWriter/ELF/DefaultLayout.h
index 676d836b26e..beef4a45ea5 100644
--- a/lld/lib/ReaderWriter/ELF/DefaultLayout.h
+++ b/lld/lib/ReaderWriter/ELF/DefaultLayout.h
@@ -27,6 +27,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/Format.h"
 
 #include <map>
@@ -541,13 +542,12 @@ AtomSection<ELFT> *DefaultLayout<ELFT>::getSection(
 
 template <class ELFT>
 ErrorOr<const lld::AtomLayout &> DefaultLayout<ELFT>::addAtom(const Atom *atom) {
-  using std::make_error_code;
   if (const DefinedAtom *definedAtom = dyn_cast<DefinedAtom>(atom)) {
     // HACK: Ignore undefined atoms. We need to adjust the interface so that
     // undefined atoms can still be included in the output symbol table for
     // -noinhibit-exec.
     if (definedAtom->contentType() == DefinedAtom::typeUnknown)
-      return make_error_code(std::errc::invalid_argument);
+      return make_error_code(llvm::errc::invalid_argument);
     const DefinedAtom::ContentPermissions permissions =
         definedAtom->permissions();
     const DefinedAtom::ContentType contentType = definedAtom->contentType();
diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
index 60c5746ac70..23036bca9f9 100644
--- a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
@@ -19,6 +19,7 @@
 #include "lld/Passes/RoundTripYAMLPass.h"
 
 #include "llvm/ADT/Triple.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
@@ -178,7 +179,7 @@ ErrorOr<StringRef> ELFLinkingContext::searchLibrary(StringRef libName) const {
       return StringRef(*new (_allocator) std::string(path.str()));
   }
   if (!llvm::sys::fs::exists(libName))
-    return std::make_error_code(std::errc::no_such_file_or_directory);
+    return make_error_code(llvm::errc::no_such_file_or_directory);
 
   return libName;
 }
@@ -195,7 +196,7 @@ ErrorOr<StringRef> ELFLinkingContext::searchFile(StringRef fileName,
     return fileName;
 
   if (llvm::sys::path::is_absolute(fileName))
-    return std::make_error_code(std::errc::no_such_file_or_directory);
+    return make_error_code(llvm::errc::no_such_file_or_directory);
 
   for (StringRef dir : _inputSearchPaths) {
     buildSearchPath(path, dir, _sysrootPath);
@@ -203,7 +204,7 @@ ErrorOr<StringRef> ELFLinkingContext::searchFile(StringRef fileName,
     if (llvm::sys::fs::exists(path.str()))
       return StringRef(*new (_allocator) std::string(path.str()));
   }
-  return std::make_error_code(std::errc::no_such_file_or_directory);
+  return make_error_code(llvm::errc::no_such_file_or_directory);
 }
 
 void ELFLinkingContext::createInternalFiles(
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index 284c7d7ec53..2ca3442a5fd 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -31,6 +31,7 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Casting.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/Host.h"
@@ -61,7 +62,7 @@ static std::error_code forEachLoadCommand(
       slc = &lcCopy;
     }
     if ( (p + slc->cmdsize) > lcRange.end() )
-      return std::make_error_code(std::errc::executable_format_error);
+      return make_error_code(llvm::errc::executable_format_error);
 
     if (func(slc->cmd, slc->cmdsize, p))
       return std::error_code();
@@ -76,7 +77,7 @@ static std::error_code appendRelocations(Relocations &relocs, StringRef buffer,
                                          bool swap, bool bigEndian,
                                          uint32_t reloff, uint32_t nreloc) {
   if ((reloff + nreloc*8) > buffer.size())
-    return std::make_error_code(std::errc::executable_format_error);
+    return make_error_code(llvm::errc::executable_format_error);
   const any_relocation_info* relocsArray =
             reinterpret_cast<const any_relocation_info*>(buffer.begin()+reloff);
 
@@ -91,9 +92,9 @@ appendIndirectSymbols(IndirectSymbols &isyms, StringRef buffer, bool swap,
                       bool bigEndian, uint32_t istOffset, uint32_t istCount,
                       uint32_t startIndex, uint32_t count) {
   if ((istOffset + istCount*4) > buffer.size())
-    return std::make_error_code(std::errc::executable_format_error);
+    return make_error_code(llvm::errc::executable_format_error);
   if (startIndex+count  > istCount)
-    return std::make_error_code(std::errc::executable_format_error);
+    return make_error_code(llvm::errc::executable_format_error);
   const uint32_t *indirectSymbolArray =
             reinterpret_cast<const uint32_t*>(buffer.begin()+istOffset);
 
@@ -141,12 +142,12 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
       fa++;
     }
     if (!foundArch) {
-      return std::make_error_code(std::errc::executable_format_error);
+      return make_error_code(llvm::errc::executable_format_error);
     }
     objSize = readBigEndian(fa->size);
     uint32_t offset = readBigEndian(fa->offset);
     if ((offset + objSize) > mb->getBufferSize())
-      return std::make_error_code(std::errc::executable_format_error);
+      return make_error_code(llvm::errc::executable_format_error);
     start += offset;
     mh = reinterpret_cast<const mach_header *>(start);
   }
@@ -170,7 +171,7 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
     swap = true;
     break;
   default:
-    return std::make_error_code(std::errc::executable_format_error);
+    return make_error_code(llvm::errc::executable_format_error);
   }
 
   // Endian swap header, if needed.
@@ -188,7 +189,7 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
       start + (is64 ? sizeof(mach_header_64) : sizeof(mach_header));
   StringRef lcRange(lcStart, smh->sizeofcmds);
   if (lcRange.end() > (start + objSize))
-    return std::make_error_code(std::errc::executable_format_error);
+    return make_error_code(llvm::errc::executable_format_error);
 
   // Normalize architecture
   f->arch = MachOLinkingContext::archFromCpuType(smh->cputype, smh->cpusubtype);
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 2ccd9e81693..f96a9f29a2c 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -29,6 +29,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Casting.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileOutputBuffer.h"
@@ -376,7 +377,7 @@ void MachOFileLayout::buildFileOffsets() {
       if (&sg1 == &sg2)
         continue;
       if (overlaps(sg1,sg2)) {
-        _ec = std::make_error_code(std::errc::executable_format_error);
+        _ec = make_error_code(llvm::errc::executable_format_error);
         return;
       }
     }
@@ -388,7 +389,7 @@ void MachOFileLayout::buildFileOffsets() {
       if (&s1 == &s2)
         continue;
       if (overlaps(s1,s2)) {
-        _ec = std::make_error_code(std::errc::executable_format_error);
+        _ec = make_error_code(llvm::errc::executable_format_error);
         return;
       }
     }
@@ -409,7 +410,7 @@ void MachOFileLayout::buildFileOffsets() {
       if ((s.address >= sg.address)
                         && (s.address+s.content.size() <= sg.address+sg.size)) {
         if (!sg.name.equals(s.segmentName)) {
-          _ec = std::make_error_code(std::errc::executable_format_error);
+          _ec = make_error_code(llvm::errc::executable_format_error);
           return;
         }
         _segInfo[&sg].sections.push_back(&s);
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
index e8f95e7b7bc..397092f67c6 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
@@ -20,6 +20,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Endian.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/FileUtilities.h"
@@ -983,7 +984,7 @@ private:
     std::string programPath = llvm::sys::FindProgramByName(program);
     if (programPath.empty()) {
       llvm::errs() << "Unable to find " << program << " in PATH\n";
-      return std::errc::broken_pipe;
+      return llvm::errc::broken_pipe;
     }
     std::vector<const char *> args;
     args.push_back(programPath.c_str());
@@ -1002,7 +1003,7 @@ private:
 
     if (llvm::sys::ExecuteAndWait(programPath.c_str(), &args[0]) != 0) {
       llvm::errs() << program << " failed\n";
-      return std::errc::broken_pipe;
+      return llvm::errc::broken_pipe;
     }
     return outFilePath.str().str();
   }
diff --git a/lld/lib/ReaderWriter/Reader.cpp b/lld/lib/ReaderWriter/Reader.cpp
index 49612fb5b8c..5bb261dfac1 100644
--- a/lld/lib/ReaderWriter/Reader.cpp
+++ b/lld/lib/ReaderWriter/Reader.cpp
@@ -9,6 +9,7 @@
 
 #include "lld/ReaderWriter/Reader.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/FileUtilities.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
@@ -42,7 +43,7 @@ Registry::parseFile(std::unique_ptr<MemoryBuffer> &mb,
       return reader->parseFile(mb, *this, result);
 
   // No Reader could parse this file.
-  return std::make_error_code(std::errc::executable_format_error);
+  return make_error_code(llvm::errc::executable_format_error);
 }
 
 static const Registry::KindStrings kindStrings[] = {
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index a45874ba53d..bf8e178fd21 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -21,6 +21,7 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -1249,7 +1250,7 @@ public:
     std::string errorInfo;
     llvm::raw_fd_ostream out(outPath.data(), errorInfo, llvm::sys::fs::F_Text);
     if (!errorInfo.empty())
-      return std::make_error_code(std::errc::no_such_file_or_directory);
+      return make_error_code(llvm::errc::no_such_file_or_directory);
 
     // Create yaml Output writer, using yaml options for context.
     YamlContext yamlContext;