Vendor import of lld release_39 branch r276489:vendor/lld/lld-release_39-r276489

https://llvm.org/svn/llvm-project/lld/branches/release_39@276489

174 files changed, 2828 insertions, 27087 deletions

diff --git a/lib/Config/Version.cpp b/lib/Config/Version.cpp
index b64ccef12c7b..60687b9d8940 100644
--- a/lib/Config/Version.cpp
+++ b/lib/Config/Version.cpp
@@ -13,8 +13,6 @@
 
 #include "lld/Config/Version.h"
 #include "llvm/Support/raw_ostream.h"
-#include <cstdlib>
-#include <cstring>
 
 using namespace llvm;
 
@@ -37,22 +35,15 @@ StringRef getLLDRevision() {
 }
 
 std::string getLLDRepositoryVersion() {
-  std::string buf;
-  llvm::raw_string_ostream OS(buf);
-  std::string Path = getLLDRepositoryPath();
-  std::string Revision = getLLDRevision();
-  if (!Path.empty() || !Revision.empty()) {
-    OS << '(';
-    if (!Path.empty())
-      OS << Path;
-    if (!Revision.empty()) {
-      if (!Path.empty())
-        OS << ' ';
-      OS << Revision;
-    }
-    OS << ')';
-  }
-  return OS.str();
+  std::string S = getLLDRepositoryPath();
+  std::string T = getLLDRevision();
+  if (S.empty() && T.empty())
+    return "";
+  if (!S.empty() && !T.empty())
+    return "(" + S + " " + T + ")";
+  if (!S.empty())
+    return "(" + S + ")";
+  return "(" + T + ")";
 }
 
 StringRef getLLDVersion() {
diff --git a/lib/Core/DefinedAtom.cpp b/lib/Core/DefinedAtom.cpp
index f1d308088ed4..8dc4d4a16f96 100644
--- a/lib/Core/DefinedAtom.cpp
+++ b/lib/Core/DefinedAtom.cpp
@@ -41,8 +41,8 @@ DefinedAtom::ContentPermissions DefinedAtom::permissions(ContentType type) {
   case typeDTraceDOF:
   case typeCompactUnwindInfo:
   case typeProcessedUnwindInfo:
-  case typeRONote:
-  case typeNoAlloc:
+  case typeObjCImageInfo:
+  case typeObjCMethodList:
     return permR__;
 
   case typeData:
@@ -52,8 +52,8 @@ DefinedAtom::ContentPermissions DefinedAtom::permissions(ContentType type) {
   case typeObjC1Class:
   case typeLazyPointer:
   case typeLazyDylibPointer:
+  case typeNonLazyPointer:
   case typeThunkTLV:
-  case typeRWNote:
     return permRW_;
 
   case typeGOT:
@@ -68,15 +68,12 @@ DefinedAtom::ContentPermissions DefinedAtom::permissions(ContentType type) {
   case typeTLVInitialData:
   case typeTLVInitialZeroFill:
   case typeTLVInitializerPtr:
-  case typeThreadData:
-  case typeThreadZeroFill:
     return permRW_L;
 
-  case typeGroupComdat:
-  case typeGnuLinkOnce:
   case typeUnknown:
   case typeTempLTO:
   case typeSectCreate:
+  case typeDSOHandle:
     return permUnknown;
   }
   llvm_unreachable("unknown content type");
diff --git a/lib/Core/Error.cpp b/lib/Core/Error.cpp
index 3b7733746dcd..4df1ce120bd9 100644
--- a/lib/Core/Error.cpp
+++ b/lib/Core/Error.cpp
@@ -39,42 +39,6 @@ const std::error_category &lld::YamlReaderCategory() {
   return o;
 }
 
-class _LinkerScriptReaderErrorCategory : public std::error_category {
-public:
-  const char *name() const LLVM_NOEXCEPT override {
-    return "lld.linker-script.reader";
-  }
-
-  std::string message(int ev) const override {
-    switch (static_cast<LinkerScriptReaderError>(ev)) {
-    case LinkerScriptReaderError::success:
-      return "Success";
-    case LinkerScriptReaderError::parse_error:
-      return "Error parsing linker script";
-    case LinkerScriptReaderError::unknown_symbol_in_expr:
-      return "Unknown symbol found when evaluating linker script expression";
-    case LinkerScriptReaderError::unrecognized_function_in_expr:
-      return "Unrecognized function call when evaluating linker script "
-             "expression";
-    case LinkerScriptReaderError::unknown_phdr_ids:
-      return "Unknown header identifiers (missing in PHDRS command) are used";
-    case LinkerScriptReaderError::extra_program_phdr:
-      return "Extra program header is found";
-    case LinkerScriptReaderError::misplaced_program_phdr:
-      return "Program header must precede load segments";
-    case LinkerScriptReaderError::program_phdr_wrong_phdrs:
-      return "Program header has invalid PHDRS attribute";
-    }
-    llvm_unreachable("An enumerator of LinkerScriptReaderError does not have a "
-                     "message defined.");
-  }
-};
-
-const std::error_category &lld::LinkerScriptReaderCategory() {
-  static _LinkerScriptReaderErrorCategory o;
-  return o;
-}
-
 namespace lld {
 
 /// Temporary class to enable make_dynamic_error_code() until
@@ -112,16 +76,16 @@ private:
 
 static dynamic_error_category categorySingleton;
 
-std::error_code make_dynamic_error_code(const char *msg) {
-  return make_dynamic_error_code(StringRef(msg));
-}
-
 std::error_code make_dynamic_error_code(StringRef msg) {
   return std::error_code(categorySingleton.add(msg), categorySingleton);
 }
 
-std::error_code make_dynamic_error_code(const Twine &msg) {
-  return std::error_code(categorySingleton.add(msg.str()), categorySingleton);
+char GenericError::ID = 0;
+
+GenericError::GenericError(Twine Msg) : Msg(Msg.str()) { }
+
+void GenericError::log(raw_ostream &OS) const {
+  OS << Msg;
 }
 
 } // namespace lld
diff --git a/lib/Core/File.cpp b/lib/Core/File.cpp
index ac95f1016797..b84132bfecd5 100644
--- a/lib/Core/File.cpp
+++ b/lib/Core/File.cpp
@@ -13,7 +13,7 @@
 
 namespace lld {
 
-File::~File() {}
+File::~File() { }
 
 File::AtomVector<DefinedAtom> File::_noDefinedAtoms;
 File::AtomVector<UndefinedAtom> File::_noUndefinedAtoms;
diff --git a/lib/Core/LinkingContext.cpp b/lib/Core/LinkingContext.cpp
index cbcf25c17df2..2732543d306e 100644
--- a/lib/Core/LinkingContext.cpp
+++ b/lib/Core/LinkingContext.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lld/Core/Alias.h"
 #include "lld/Core/LinkingContext.h"
 #include "lld/Core/Resolver.h"
 #include "lld/Core/Simple.h"
@@ -16,16 +15,7 @@
 
 namespace lld {
 
-LinkingContext::LinkingContext()
-    : _deadStrip(false), _allowDuplicates(false),
-      _globalsAreDeadStripRoots(false),
-      _searchArchivesToOverrideTentativeDefinitions(false),
-      _searchSharedLibrariesToOverrideTentativeDefinitions(false),
-      _warnIfCoalesableAtomsHaveDifferentCanBeNull(false),
-      _warnIfCoalesableAtomsHaveDifferentLoadName(false),
-      _printRemainingUndefines(true), _allowRemainingUndefines(false),
-      _logInputFiles(false), _allowShlibUndefines(true),
-      _outputFileType(OutputFileType::Default), _nextOrdinal(0) {}
+LinkingContext::LinkingContext() {}
 
 LinkingContext::~LinkingContext() {}
 
@@ -33,15 +23,10 @@ bool LinkingContext::validate(raw_ostream &diagnostics) {
   return validateImpl(diagnostics);
 }
 
-std::error_code LinkingContext::writeFile(const File &linkedFile) const {
+llvm::Error LinkingContext::writeFile(const File &linkedFile) const {
   return this->writer().writeFile(linkedFile, _outputPath);
 }
 
-void LinkingContext::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  this->writer().createImplicitFiles(result);
-}
-
 std::unique_ptr<File> LinkingContext::createEntrySymbolFile() const {
   return createEntrySymbolFile("<command line option -e>");
 }
@@ -50,7 +35,8 @@ std::unique_ptr<File>
 LinkingContext::createEntrySymbolFile(StringRef filename) const {
   if (entrySymbolName().empty())
     return nullptr;
-  std::unique_ptr<SimpleFile> entryFile(new SimpleFile(filename));
+  std::unique_ptr<SimpleFile> entryFile(new SimpleFile(filename,
+                                                       File::kindEntryObject));
   entryFile->addAtom(
       *(new (_allocator) SimpleUndefinedAtom(*entryFile, entrySymbolName())));
   return std::move(entryFile);
@@ -64,41 +50,20 @@ std::unique_ptr<File>
 LinkingContext::createUndefinedSymbolFile(StringRef filename) const {
   if (_initialUndefinedSymbols.empty())
     return nullptr;
-  std::unique_ptr<SimpleFile> undefinedSymFile(new SimpleFile(filename));
+  std::unique_ptr<SimpleFile> undefinedSymFile(
+    new SimpleFile(filename, File::kindUndefinedSymsObject));
   for (StringRef undefSym : _initialUndefinedSymbols)
     undefinedSymFile->addAtom(*(new (_allocator) SimpleUndefinedAtom(
                                    *undefinedSymFile, undefSym)));
   return std::move(undefinedSymFile);
 }
 
-std::unique_ptr<File> LinkingContext::createAliasSymbolFile() const {
-  if (getAliases().empty())
-    return nullptr;
-  std::unique_ptr<SimpleFile> file(new SimpleFile("<alias>"));
-  for (const auto &i : getAliases()) {
-    StringRef from = i.first;
-    StringRef to = i.second;
-    SimpleDefinedAtom *fromAtom = new (_allocator) AliasAtom(*file, from);
-    UndefinedAtom *toAtom = new (_allocator) SimpleUndefinedAtom(*file, to);
-    fromAtom->addReference(Reference::KindNamespace::all,
-                           Reference::KindArch::all, Reference::kindLayoutAfter,
-                           0, toAtom, 0);
-    file->addAtom(*fromAtom);
-    file->addAtom(*toAtom);
-  }
-  return std::move(file);
-}
-
 void LinkingContext::createInternalFiles(
     std::vector<std::unique_ptr<File> > &result) const {
   if (std::unique_ptr<File> file = createEntrySymbolFile())
     result.push_back(std::move(file));
   if (std::unique_ptr<File> file = createUndefinedSymbolFile())
     result.push_back(std::move(file));
-  if (std::unique_ptr<File> file = createAliasSymbolFile())
-    result.push_back(std::move(file));
 }
 
-void LinkingContext::addPasses(PassManager &pm) {}
-
 } // end namespace lld
diff --git a/lib/Core/Reader.cpp b/lib/Core/Reader.cpp
index 6069093d211e..107db07891da 100644
--- a/lib/Core/Reader.cpp
+++ b/lib/Core/Reader.cpp
@@ -47,7 +47,6 @@ Registry::loadFile(std::unique_ptr<MemoryBuffer> mb) const {
 
 static const Registry::KindStrings kindStrings[] = {
     {Reference::kindLayoutAfter, "layout-after"},
-    {Reference::kindGroupChild, "group-child"},
     {Reference::kindAssociate, "associate"},
     LLD_KIND_STRING_END};
 
diff --git a/lib/Core/Resolver.cpp b/lib/Core/Resolver.cpp
index 8f89856c4a47..ef694fd972fc 100644
--- a/lib/Core/Resolver.cpp
+++ b/lib/Core/Resolver.cpp
@@ -19,6 +19,7 @@
 #include "lld/Core/UndefinedAtom.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
@@ -29,26 +30,27 @@
 
 namespace lld {
 
-bool Resolver::handleFile(File &file) {
+llvm::Expected<bool> Resolver::handleFile(File &file) {
+  if (auto ec = _ctx.handleLoadedFile(file))
+    return std::move(ec);
   bool undefAdded = false;
-  for (const DefinedAtom *atom : file.defined())
-    doDefinedAtom(*atom);
-  for (const UndefinedAtom *atom : file.undefined()) {
-    if (doUndefinedAtom(*atom)) {
+  for (auto &atom : file.defined().owning_ptrs())
+    doDefinedAtom(std::move(atom));
+  for (auto &atom : file.undefined().owning_ptrs()) {
+    if (doUndefinedAtom(std::move(atom)))
       undefAdded = true;
-      maybePreloadArchiveMember(atom->name());
-    }
   }
-  for (const SharedLibraryAtom *atom : file.sharedLibrary())
-    doSharedLibraryAtom(*atom);
-  for (const AbsoluteAtom *atom : file.absolute())
-    doAbsoluteAtom(*atom);
+  for (auto &atom : file.sharedLibrary().owning_ptrs())
+    doSharedLibraryAtom(std::move(atom));
+  for (auto &atom : file.absolute().owning_ptrs())
+    doAbsoluteAtom(std::move(atom));
   return undefAdded;
 }
 
-void Resolver::forEachUndefines(File &file, bool searchForOverrides,
-                                UndefCallback callback) {
+llvm::Expected<bool> Resolver::forEachUndefines(File &file,
+                                                UndefCallback callback) {
   size_t i = _undefineIndex[&file];
+  bool undefAdded = false;
   do {
     for (; i < _undefines.size(); ++i) {
       StringRef undefName = _undefines[i];
@@ -60,190 +62,120 @@ void Resolver::forEachUndefines(File &file, bool searchForOverrides,
         _undefines[i] = "";
         continue;
       }
-      callback(undefName, false);
-    }
-    if (!searchForOverrides)
-      continue;
-    for (StringRef tentDefName : _symbolTable.tentativeDefinitions()) {
-      // Load for previous tentative may also have loaded
-      // something that overrode this tentative, so always check.
-      const Atom *curAtom = _symbolTable.findByName(tentDefName);
-      assert(curAtom != nullptr);
-      if (const DefinedAtom *curDefAtom = dyn_cast<DefinedAtom>(curAtom))
-        if (curDefAtom->merge() == DefinedAtom::mergeAsTentative)
-          callback(tentDefName, true);
+      auto undefAddedOrError = callback(undefName);
+      if (auto ec = undefAddedOrError.takeError())
+        return std::move(ec);
+      undefAdded |= undefAddedOrError.get();
     }
   } while (i < _undefines.size());
   _undefineIndex[&file] = i;
+  return undefAdded;
 }
 
-bool Resolver::handleArchiveFile(File &file) {
+llvm::Expected<bool> Resolver::handleArchiveFile(File &file) {
   ArchiveLibraryFile *archiveFile = cast<ArchiveLibraryFile>(&file);
-  bool searchForOverrides =
-      _ctx.searchArchivesToOverrideTentativeDefinitions();
-  bool undefAdded = false;
-  forEachUndefines(file, searchForOverrides,
-                   [&](StringRef undefName, bool dataSymbolOnly) {
-    if (File *member = archiveFile->find(undefName, dataSymbolOnly)) {
+  return forEachUndefines(file,
+                          [&](StringRef undefName) -> llvm::Expected<bool> {
+    if (File *member = archiveFile->find(undefName)) {
       member->setOrdinal(_ctx.getNextOrdinalAndIncrement());
-      member->beforeLink();
-      updatePreloadArchiveMap();
-      undefAdded = handleFile(*member) || undefAdded;
+      return handleFile(*member);
     }
+    return false;
   });
-  return undefAdded;
 }
 
-void Resolver::handleSharedLibrary(File &file) {
+llvm::Error Resolver::handleSharedLibrary(File &file) {
   // Add all the atoms from the shared library
   SharedLibraryFile *sharedLibrary = cast<SharedLibraryFile>(&file);
-  handleFile(*sharedLibrary);
-  bool searchForOverrides =
-      _ctx.searchSharedLibrariesToOverrideTentativeDefinitions();
-  forEachUndefines(file, searchForOverrides,
-                   [&](StringRef undefName, bool dataSymbolOnly) {
-    if (const SharedLibraryAtom *atom =
-            sharedLibrary->exports(undefName, dataSymbolOnly))
-      doSharedLibraryAtom(*atom);
-  });
+  auto undefAddedOrError = handleFile(*sharedLibrary);
+  if (auto ec = undefAddedOrError.takeError())
+    return ec;
+  undefAddedOrError =
+      forEachUndefines(file, [&](StringRef undefName) -> llvm::Expected<bool> {
+        auto atom = sharedLibrary->exports(undefName);
+        if (atom.get())
+          doSharedLibraryAtom(std::move(atom));
+        return false;
+      });
+
+  if (auto ec = undefAddedOrError.takeError())
+    return ec;
+  return llvm::Error();
 }
 
-bool Resolver::doUndefinedAtom(const UndefinedAtom &atom) {
+bool Resolver::doUndefinedAtom(OwningAtomPtr<UndefinedAtom> atom) {
   DEBUG_WITH_TYPE("resolver", llvm::dbgs()
                     << "       UndefinedAtom: "
-                    << llvm::format("0x%09lX", &atom)
-                    << ", name=" << atom.name() << "\n");
-
-  // add to list of known atoms
-  _atoms.push_back(&atom);
+                    << llvm::format("0x%09lX", atom.get())
+                    << ", name=" << atom.get()->name() << "\n");
 
   // tell symbol table
-  bool newUndefAdded = _symbolTable.add(atom);
+  bool newUndefAdded = _symbolTable.add(*atom.get());
   if (newUndefAdded)
-    _undefines.push_back(atom.name());
-
-  // If the undefined symbol has an alternative name, try to resolve the
-  // symbol with the name to give it a second chance. This feature is used
-  // for COFF "weak external" symbol.
-  if (newUndefAdded || !_symbolTable.isDefined(atom.name())) {
-    if (const UndefinedAtom *fallbackAtom = atom.fallback()) {
-      doUndefinedAtom(*fallbackAtom);
-      _symbolTable.addReplacement(&atom, fallbackAtom);
-    }
-  }
-  return newUndefAdded;
-}
+    _undefines.push_back(atom.get()->name());
 
-/// \brief Add the section group and the group-child reference members.
-void Resolver::maybeAddSectionGroupOrGnuLinkOnce(const DefinedAtom &atom) {
-  // First time adding a group?
-  bool isFirstTime = _symbolTable.addGroup(atom);
-
-  if (!isFirstTime) {
-    // If duplicate symbols are allowed, select the first group.
-    if (_ctx.getAllowDuplicates())
-      return;
-    auto *prevGroup = dyn_cast<DefinedAtom>(_symbolTable.findGroup(atom.name()));
-    assert(prevGroup &&
-           "Internal Error: The group atom could only be a defined atom");
-    // The atoms should be of the same content type, reject invalid group
-    // resolution behaviors.
-    if (atom.contentType() == prevGroup->contentType())
-      return;
-    llvm::errs() << "SymbolTable: error while merging " << atom.name()
-                 << "\n";
-    llvm::report_fatal_error("duplicate symbol error");
-  }
+  // add to list of known atoms
+  _atoms.push_back(OwningAtomPtr<Atom>(atom.release()));
 
-  for (const Reference *r : atom) {
-    if (r->kindNamespace() == lld::Reference::KindNamespace::all &&
-        r->kindValue() == lld::Reference::kindGroupChild) {
-      const DefinedAtom *target = dyn_cast<DefinedAtom>(r->target());
-      assert(target && "Internal Error: kindGroupChild references need to "
-                       "be associated with Defined Atoms only");
-      _atoms.push_back(target);
-      _symbolTable.add(*target);
-    }
-  }
+  return newUndefAdded;
 }
 
 // Called on each atom when a file is added. Returns true if a given
 // atom is added to the symbol table.
-void Resolver::doDefinedAtom(const DefinedAtom &atom) {
+void Resolver::doDefinedAtom(OwningAtomPtr<DefinedAtom> atom) {
   DEBUG_WITH_TYPE("resolver", llvm::dbgs()
                     << "         DefinedAtom: "
-                    << llvm::format("0x%09lX", &atom)
+                    << llvm::format("0x%09lX", atom.get())
                     << ", file=#"
-                    << atom.file().ordinal()
+                    << atom.get()->file().ordinal()
                     << ", atom=#"
-                    << atom.ordinal()
+                    << atom.get()->ordinal()
                     << ", name="
-                    << atom.name()
+                    << atom.get()->name()
                     << ", type="
-                    << atom.contentType()
+                    << atom.get()->contentType()
                     << "\n");
 
-  // add to list of known atoms
-  _atoms.push_back(&atom);
-
-  if (atom.isGroupParent()) {
-    maybeAddSectionGroupOrGnuLinkOnce(atom);
-  } else {
-    _symbolTable.add(atom);
-  }
-
   // An atom that should never be dead-stripped is a dead-strip root.
-  if (_ctx.deadStrip() && atom.deadStrip() == DefinedAtom::deadStripNever) {
-    _deadStripRoots.insert(&atom);
+  if (_ctx.deadStrip() &&
+      atom.get()->deadStrip() == DefinedAtom::deadStripNever) {
+    _deadStripRoots.insert(atom.get());
   }
+
+  // add to list of known atoms
+  _symbolTable.add(*atom.get());
+  _atoms.push_back(OwningAtomPtr<Atom>(atom.release()));
 }
 
-void Resolver::doSharedLibraryAtom(const SharedLibraryAtom &atom) {
+void Resolver::doSharedLibraryAtom(OwningAtomPtr<SharedLibraryAtom> atom) {
   DEBUG_WITH_TYPE("resolver", llvm::dbgs()
                     << "   SharedLibraryAtom: "
-                    << llvm::format("0x%09lX", &atom)
+                    << llvm::format("0x%09lX", atom.get())
                     << ", name="
-                    << atom.name()
+                    << atom.get()->name()
                     << "\n");
 
-  // add to list of known atoms
-  _atoms.push_back(&atom);
-
   // tell symbol table
-  _symbolTable.add(atom);
+  _symbolTable.add(*atom.get());
+
+  // add to list of known atoms
+  _atoms.push_back(OwningAtomPtr<Atom>(atom.release()));
 }
 
-void Resolver::doAbsoluteAtom(const AbsoluteAtom &atom) {
+void Resolver::doAbsoluteAtom(OwningAtomPtr<AbsoluteAtom> atom) {
   DEBUG_WITH_TYPE("resolver", llvm::dbgs()
                     << "       AbsoluteAtom: "
-                    << llvm::format("0x%09lX", &atom)
+                    << llvm::format("0x%09lX", atom.get())
                     << ", name="
-                    << atom.name()
+                    << atom.get()->name()
                     << "\n");
 
-  // add to list of known atoms
-  _atoms.push_back(&atom);
-
   // tell symbol table
-  if (atom.scope() != Atom::scopeTranslationUnit)
-    _symbolTable.add(atom);
-}
+  if (atom.get()->scope() != Atom::scopeTranslationUnit)
+    _symbolTable.add(*atom.get());
 
-// utility to add a vector of atoms
-void Resolver::addAtoms(const std::vector<const DefinedAtom *> &newAtoms) {
-  for (const DefinedAtom *newAtom : newAtoms)
-    doDefinedAtom(*newAtom);
-}
-
-// Instantiate an archive file member if there's a file containing a
-// defined symbol for a given symbol name. Instantiation is done in a
-// different worker thread and has no visible side effect.
-void Resolver::maybePreloadArchiveMember(StringRef sym) {
-  auto it = _archiveMap.find(sym);
-  if (it == _archiveMap.end())
-    return;
-  ArchiveLibraryFile *archive = it->second;
-  archive->preload(_ctx.getTaskGroup(), sym);
+  // add to list of known atoms
+  _atoms.push_back(OwningAtomPtr<Atom>(atom.release()));
 }
 
 // Returns true if at least one of N previous files has created an
@@ -276,23 +208,6 @@ File *Resolver::getFile(int &index) {
   return cast<FileNode>(inputs[index++].get())->getFile();
 }
 
-// Update a map of Symbol -> ArchiveFile. The map is used for speculative
-// file loading.
-void Resolver::updatePreloadArchiveMap() {
-  std::vector<std::unique_ptr<Node>> &nodes = _ctx.getNodes();
-  for (int i = nodes.size() - 1; i >= 0; --i) {
-    auto *fnode = dyn_cast<FileNode>(nodes[i].get());
-    if (!fnode)
-      continue;
-    auto *archive = dyn_cast<ArchiveLibraryFile>(fnode->getFile());
-    if (!archive || _archiveSeen.count(archive))
-      continue;
-    _archiveSeen.insert(archive);
-    for (StringRef sym : archive->getDefinedSymbols())
-      _archiveMap[sym] = archive;
-  }
-}
-
 // Keep adding atoms until _ctx.getNextFile() returns an error. This
 // function is where undefined atoms are resolved.
 bool Resolver::resolveUndefines() {
@@ -315,10 +230,17 @@ bool Resolver::resolveUndefines() {
     }
     DEBUG_WITH_TYPE("resolver",
                     llvm::dbgs() << "Loaded file: " << file->path() << "\n");
-    file->beforeLink();
-    updatePreloadArchiveMap();
     switch (file->kind()) {
-    case File::kindObject:
+    case File::kindErrorObject:
+    case File::kindNormalizedObject:
+    case File::kindMachObject:
+    case File::kindCEntryObject:
+    case File::kindHeaderObject:
+    case File::kindEntryObject:
+    case File::kindUndefinedSymsObject:
+    case File::kindStubHelperObject:
+    case File::kindResolverMergedObject:
+    case File::kindSectCreateObject: {
       // The same file may be visited more than once if the file is
       // in --start-group and --end-group. Only library files should
       // be processed more than once.
@@ -327,17 +249,41 @@ bool Resolver::resolveUndefines() {
       seen.insert(file);
       assert(!file->hasOrdinal());
       file->setOrdinal(_ctx.getNextOrdinalAndIncrement());
-      undefAdded = handleFile(*file);
+      auto undefAddedOrError = handleFile(*file);
+      if (auto EC = undefAddedOrError.takeError()) {
+        // FIXME: This should be passed to logAllUnhandledErrors but it needs
+        // to be passed a Twine instead of a string.
+        llvm::errs() << "Error in " + file->path() << ": ";
+        logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
+        return false;
+      }
+      undefAdded = undefAddedOrError.get();
       break;
-    case File::kindArchiveLibrary:
+    }
+    case File::kindArchiveLibrary: {
       if (!file->hasOrdinal())
         file->setOrdinal(_ctx.getNextOrdinalAndIncrement());
-      undefAdded = handleArchiveFile(*file);
+      auto undefAddedOrError = handleArchiveFile(*file);
+      if (auto EC = undefAddedOrError.takeError()) {
+        // FIXME: This should be passed to logAllUnhandledErrors but it needs
+        // to be passed a Twine instead of a string.
+        llvm::errs() << "Error in " + file->path() << ": ";
+        logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
+        return false;
+      }
+      undefAdded = undefAddedOrError.get();
       break;
+    }
     case File::kindSharedLibrary:
       if (!file->hasOrdinal())
         file->setOrdinal(_ctx.getNextOrdinalAndIncrement());
-      handleSharedLibrary(*file);
+      if (auto EC = handleSharedLibrary(*file)) {
+        // FIXME: This should be passed to logAllUnhandledErrors but it needs
+        // to be passed a Twine instead of a string.
+        llvm::errs() << "Error in " + file->path() << ": ";
+        logAllUnhandledErrors(std::move(EC), llvm::errs(), std::string());
+        return false;
+      }
       break;
     }
     _newUndefinesAdded[file] = undefAdded;
@@ -350,8 +296,8 @@ void Resolver::updateReferences() {
   DEBUG_WITH_TYPE("resolver",
                   llvm::dbgs() << "******** Updating references:\n");
   ScopedTask task(getDefaultDomain(), "updateReferences");
-  for (const Atom *atom : _atoms) {
-    if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom)) {
+  for (const OwningAtomPtr<Atom> &atom : _atoms) {
+    if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom.get())) {
       for (const Reference *ref : *defAtom) {
         // A reference of type kindAssociate should't be updated.
         // Instead, an atom having such reference will be removed
@@ -359,7 +305,7 @@ void Resolver::updateReferences() {
         // go away as a group.
         if (ref->kindNamespace() == lld::Reference::KindNamespace::all &&
             ref->kindValue() == lld::Reference::kindAssociate) {
-          if (_symbolTable.isCoalescedAway(atom))
+          if (_symbolTable.isCoalescedAway(atom.get()))
             _deadAtoms.insert(ref->target());
           continue;
         }
@@ -391,8 +337,7 @@ void Resolver::markLive(const Atom *atom) {
 static bool isBackref(const Reference *ref) {
   if (ref->kindNamespace() != lld::Reference::KindNamespace::all)
     return false;
-  return (ref->kindValue() == lld::Reference::kindLayoutAfter ||
-          ref->kindValue() == lld::Reference::kindGroupChild);
+  return (ref->kindValue() == lld::Reference::kindLayoutAfter);
 }
 
 // remove all atoms not actually used
@@ -408,19 +353,19 @@ void Resolver::deadStripOptimize() {
   // Make a reverse map of such references before traversing the graph.
   // While traversing the list of atoms, mark AbsoluteAtoms as live
   // in order to avoid reclaim.
-  for (const Atom *atom : _atoms) {
-    if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom))
+  for (const OwningAtomPtr<Atom> &atom : _atoms) {
+    if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom.get()))
       for (const Reference *ref : *defAtom)
         if (isBackref(ref))
-          _reverseRef.insert(std::make_pair(ref->target(), atom));
-    if (const AbsoluteAtom *absAtom = dyn_cast<AbsoluteAtom>(atom))
+          _reverseRef.insert(std::make_pair(ref->target(), atom.get()));
+    if (const AbsoluteAtom *absAtom = dyn_cast<AbsoluteAtom>(atom.get()))
       markLive(absAtom);
   }
 
   // By default, shared libraries are built with all globals as dead strip roots
   if (_ctx.globalsAreDeadStripRoots())
-    for (const Atom *atom : _atoms)
-      if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom))
+    for (const OwningAtomPtr<Atom> &atom : _atoms)
+      if (const DefinedAtom *defAtom = dyn_cast<DefinedAtom>(atom.get()))
         if (defAtom->scope() == DefinedAtom::scopeGlobal)
           _deadStripRoots.insert(defAtom);
 
@@ -436,8 +381,9 @@ void Resolver::deadStripOptimize() {
     markLive(dsrAtom);
 
   // now remove all non-live atoms from _atoms
-  _atoms.erase(std::remove_if(_atoms.begin(), _atoms.end(), [&](const Atom *a) {
-                 return _liveAtoms.count(a) == 0;
+  _atoms.erase(std::remove_if(_atoms.begin(), _atoms.end(),
+                              [&](OwningAtomPtr<Atom> &a) {
+                 return _liveAtoms.count(a.get()) == 0;
                }),
                _atoms.end());
 }
@@ -496,8 +442,10 @@ void Resolver::removeCoalescedAwayAtoms() {
   DEBUG_WITH_TYPE("resolver",
                   llvm::dbgs() << "******** Removing coalesced away atoms:\n");
   ScopedTask task(getDefaultDomain(), "removeCoalescedAwayAtoms");
-  _atoms.erase(std::remove_if(_atoms.begin(), _atoms.end(), [&](const Atom *a) {
-                 return _symbolTable.isCoalescedAway(a) || _deadAtoms.count(a);
+  _atoms.erase(std::remove_if(_atoms.begin(), _atoms.end(),
+                              [&](OwningAtomPtr<Atom> &a) {
+                 return _symbolTable.isCoalescedAway(a.get()) ||
+                        _deadAtoms.count(a.get());
                }),
                _atoms.end());
 }
@@ -505,7 +453,6 @@ void Resolver::removeCoalescedAwayAtoms() {
 bool Resolver::resolve() {
   DEBUG_WITH_TYPE("resolver",
                   llvm::dbgs() << "******** Resolving atom references:\n");
-  updatePreloadArchiveMap();
   if (!resolveUndefines())
     return false;
   updateReferences();
@@ -524,15 +471,16 @@ bool Resolver::resolve() {
   return true;
 }
 
-void Resolver::MergedFile::addAtoms(std::vector<const Atom *> &all) {
+void Resolver::MergedFile::addAtoms(
+                              llvm::MutableArrayRef<OwningAtomPtr<Atom>> all) {
   ScopedTask task(getDefaultDomain(), "addAtoms");
   DEBUG_WITH_TYPE("resolver", llvm::dbgs() << "Resolver final atom list:\n");
 
-  for (const Atom *atom : all) {
+  for (OwningAtomPtr<Atom> &atom : all) {
 #ifndef NDEBUG
-    if (auto *definedAtom = dyn_cast<DefinedAtom>(atom)) {
+    if (auto *definedAtom = dyn_cast<DefinedAtom>(atom.get())) {
       DEBUG_WITH_TYPE("resolver", llvm::dbgs()
-                      << llvm::format("    0x%09lX", atom)
+                      << llvm::format("    0x%09lX", definedAtom)
                       << ", file=#"
                       << definedAtom->file().ordinal()
                       << ", atom=#"
@@ -544,13 +492,13 @@ void Resolver::MergedFile::addAtoms(std::vector<const Atom *> &all) {
                       << "\n");
     } else {
       DEBUG_WITH_TYPE("resolver", llvm::dbgs()
-                      << llvm::format("    0x%09lX", atom)
+                      << llvm::format("    0x%09lX", atom.get())
                       << ", name="
-                      << atom->name()
+                      << atom.get()->name()
                       << "\n");
     }
 #endif
-    addAtom(*atom);
+    addAtom(*atom.release());
   }
 }
 
diff --git a/lib/Core/SymbolTable.cpp b/lib/Core/SymbolTable.cpp
index b85a83ffbfe6..44631a5d40dc 100644
--- a/lib/Core/SymbolTable.cpp
+++ b/lib/Core/SymbolTable.cpp
@@ -28,8 +28,6 @@
 #include <vector>
 
 namespace lld {
-SymbolTable::SymbolTable(LinkingContext &context) : _ctx(context) {}
-
 bool SymbolTable::add(const UndefinedAtom &atom) { return addByName(atom); }
 
 bool SymbolTable::add(const SharedLibraryAtom &atom) { return addByName(atom); }
@@ -55,25 +53,6 @@ bool SymbolTable::add(const DefinedAtom &atom) {
   return false;
 }
 
-const Atom *SymbolTable::findGroup(StringRef sym) {
-  NameToAtom::iterator pos = _groupTable.find(sym);
-  if (pos == _groupTable.end())
-    return nullptr;
-  return pos->second;
-}
-
-bool SymbolTable::addGroup(const DefinedAtom &da) {
-  StringRef name = da.name();
-  assert(!name.empty());
-  const Atom *existing = findGroup(name);
-  if (existing == nullptr) {
-    _groupTable[name] = &da;
-    return true;
-  }
-  _replacedAtoms[&da] = existing;
-  return false;
-}
-
 enum NameCollisionResolution {
   NCR_First,
   NCR_Second,
@@ -185,19 +164,16 @@ bool SymbolTable::addByName(const Atom &newAtom) {
       // fallthrough
     }
     case MCR_Error:
-      if (!_ctx.getAllowDuplicates()) {
-        llvm::errs() << "Duplicate symbols: "
-                     << existing->name()
-                     << ":"
-                     << existing->file().path()
-                     << " and "
-                     << newAtom.name()
-                     << ":"
-                     << newAtom.file().path()
-                     << "\n";
-        llvm::report_fatal_error("duplicate symbol error");
-      }
-      useNew = false;
+      llvm::errs() << "Duplicate symbols: "
+                   << existing->name()
+                   << ":"
+                   << existing->file().path()
+                   << " and "
+                   << newAtom.name()
+                   << ":"
+                   << newAtom.file().path()
+                   << "\n";
+      llvm::report_fatal_error("duplicate symbol error");
       break;
     }
     break;
@@ -207,56 +183,13 @@ bool SymbolTable::addByName(const Atom &newAtom) {
     const UndefinedAtom* newUndef = cast<UndefinedAtom>(&newAtom);
 
     bool sameCanBeNull = (existingUndef->canBeNull() == newUndef->canBeNull());
-    if (!sameCanBeNull && _ctx.warnIfCoalesableAtomsHaveDifferentCanBeNull()) {
-      llvm::errs() << "lld warning: undefined symbol "
-                   << existingUndef->name()
-                   << " has different weakness in "
-                   << existingUndef->file().path()
-                   << " and in " << newUndef->file().path() << "\n";
-    }
-
-    const UndefinedAtom *existingFallback = existingUndef->fallback();
-    const UndefinedAtom *newFallback = newUndef->fallback();
-    bool hasDifferentFallback =
-        (existingFallback && newFallback &&
-         existingFallback->name() != newFallback->name());
-    if (hasDifferentFallback) {
-      llvm::errs() << "lld warning: undefined symbol "
-                   << existingUndef->name() << " has different fallback: "
-                   << existingFallback->name() << " in "
-                   << existingUndef->file().path() << " and "
-                   << newFallback->name() << " in "
-                   << newUndef->file().path() << "\n";
-    }
-
-    bool hasNewFallback = newUndef->fallback();
     if (sameCanBeNull)
-      useNew = hasNewFallback;
+      useNew = false;
     else
       useNew = (newUndef->canBeNull() < existingUndef->canBeNull());
     break;
   }
   case NCR_DupShLib: {
-    const SharedLibraryAtom *curShLib = cast<SharedLibraryAtom>(existing);
-    const SharedLibraryAtom *newShLib = cast<SharedLibraryAtom>(&newAtom);
-    bool sameNullness =
-        (curShLib->canBeNullAtRuntime() == newShLib->canBeNullAtRuntime());
-    bool sameName = curShLib->loadName().equals(newShLib->loadName());
-    if (sameName && !sameNullness &&
-        _ctx.warnIfCoalesableAtomsHaveDifferentCanBeNull()) {
-      // FIXME: need diagonstics interface for writing warning messages
-      llvm::errs() << "lld warning: shared library symbol "
-                   << curShLib->name() << " has different weakness in "
-                   << curShLib->file().path() << " and in "
-                   << newShLib->file().path();
-    }
-    if (!sameName && _ctx.warnIfCoalesableAtomsHaveDifferentLoadName()) {
-      // FIXME: need diagonstics interface for writing warning messages
-      llvm::errs() << "lld warning: shared library symbol "
-                   << curShLib->name() << " has different load path in "
-                   << curShLib->file().path() << " and in "
-                   << newShLib->file().path();
-    }
     useNew = false;
     break;
   }
@@ -266,9 +199,6 @@ bool SymbolTable::addByName(const Atom &newAtom) {
     break;
   }
 
-  // Give context a chance to change which is kept.
-  _ctx.notifySymbolTableCoalesce(existing, &newAtom, useNew);
-
   if (useNew) {
     // Update name table to use new atom.
     _nameTable[name] = &newAtom;
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index 840ccce50ab3..1bd1f2125816 100644
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -1,19 +1,9 @@
-set(LLVM_TARGET_DEFINITIONS UniversalDriverOptions.td)
-tablegen(LLVM UniversalDriverOptions.inc -gen-opt-parser-defs)
-set(LLVM_TARGET_DEFINITIONS GnuLdOptions.td)
-tablegen(LLVM GnuLdOptions.inc -gen-opt-parser-defs)
-set(LLVM_TARGET_DEFINITIONS CoreOptions.td)
-tablegen(LLVM CoreOptions.inc -gen-opt-parser-defs)
 set(LLVM_TARGET_DEFINITIONS DarwinLdOptions.td)
 tablegen(LLVM DarwinLdOptions.inc -gen-opt-parser-defs)
 add_public_tablegen_target(DriverOptionsTableGen)
 
 add_lld_library(lldDriver
-  CoreDriver.cpp
   DarwinLdDriver.cpp
-  Driver.cpp
-  GnuLdDriver.cpp
-  UniversalDriver.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Driver
@@ -21,16 +11,6 @@ add_lld_library(lldDriver
   LINK_LIBS
     lldConfig
     lldMachO
-    lldCOFF
-    lldELF
-    lldELF2
-    lldAArch64ELFTarget
-    lldARMELFTarget
-    lldHexagonELFTarget
-    lldMipsELFTarget
-    lldX86ELFTarget
-    lldExampleSubTarget
-    lldX86_64ELFTarget
     lldCore
     lldReaderWriter
     lldYAML
@@ -40,4 +20,3 @@ add_lld_library(lldDriver
   )
 
 add_dependencies(lldDriver DriverOptionsTableGen)
-
diff --git a/lib/Driver/CoreDriver.cpp b/lib/Driver/CoreDriver.cpp
deleted file mode 100644
index ce8648595109..000000000000
--- a/lib/Driver/CoreDriver.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//===- lib/Driver/CoreDriver.cpp ------------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lld/Core/Reader.h"
-#include "lld/Driver/Driver.h"
-#include "lld/ReaderWriter/CoreLinkingContext.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Option/Option.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace lld;
-
-namespace {
-
-// Create enum with OPT_xxx values for each option in CoreOptions.td
-enum {
-  OPT_INVALID = 0,
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELP, META) \
-          OPT_##ID,
-#include "CoreOptions.inc"
-#undef OPTION
-};
-
-// Create prefix string literals used in CoreOptions.td
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
-#include "CoreOptions.inc"
-#undef PREFIX
-
-// Create table mapping all options defined in CoreOptions.td
-static const llvm::opt::OptTable::Info infoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELPTEXT, METAVAR)   \
-  { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, llvm::opt::Option::KIND##Class, \
-    PARAM, FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS },
-#include "CoreOptions.inc"
-#undef OPTION
-};
-
-// Create OptTable class for parsing actual command line arguments
-class CoreOptTable : public llvm::opt::OptTable {
-public:
-  CoreOptTable() : OptTable(infoTable) {}
-};
-
-} // namespace anonymous
-
-
-namespace lld {
-
-static const Registry::KindStrings coreKindStrings[] = {
-  { CoreLinkingContext::TEST_RELOC_CALL32,        "call32" },
-  { CoreLinkingContext::TEST_RELOC_PCREL32,       "pcrel32" },
-  { CoreLinkingContext::TEST_RELOC_GOT_LOAD32,    "gotLoad32" },
-  { CoreLinkingContext::TEST_RELOC_GOT_USE32,     "gotUse32" },
-  { CoreLinkingContext::TEST_RELOC_LEA32_WAS_GOT, "lea32wasGot" },
-  LLD_KIND_STRING_END
-};
-
-bool CoreDriver::link(llvm::ArrayRef<const char *> args,
-                      raw_ostream &diagnostics) {
-  CoreLinkingContext ctx;
-
-  // Register possible input file parsers.
-  ctx.registry().addSupportYamlFiles();
-  ctx.registry().addKindTable(Reference::KindNamespace::testing,
-                              Reference::KindArch::all, coreKindStrings);
-
-  if (!parse(args, ctx))
-    return false;
-  return Driver::link(ctx);
-}
-
-bool CoreDriver::parse(llvm::ArrayRef<const char *> args,
-                       CoreLinkingContext &ctx, raw_ostream &diagnostics) {
-  // Parse command line options using CoreOptions.td
-  CoreOptTable table;
-  unsigned missingIndex;
-  unsigned missingCount;
-  llvm::opt::InputArgList parsedArgs =
-      table.ParseArgs(args.slice(1), missingIndex, missingCount);
-  if (missingCount) {
-    diagnostics << "error: missing arg value for '"
-                << parsedArgs.getArgString(missingIndex) << "' expected "
-                << missingCount << " argument(s).\n";
-    return false;
-  }
-
-  // Set default options
-  ctx.setOutputPath("-");
-  ctx.setDeadStripping(false);
-  ctx.setGlobalsAreDeadStripRoots(false);
-  ctx.setPrintRemainingUndefines(false);
-  ctx.setAllowRemainingUndefines(true);
-  ctx.setSearchArchivesToOverrideTentativeDefinitions(false);
-
-  // Process all the arguments and create input files.
-  for (auto inputArg : parsedArgs) {
-    switch (inputArg->getOption().getID()) {
-    case OPT_mllvm:
-      ctx.appendLLVMOption(inputArg->getValue());
-      break;
-
-    case OPT_entry:
-      ctx.setEntrySymbolName(inputArg->getValue());
-      break;
-
-    case OPT_output:
-      ctx.setOutputPath(inputArg->getValue());
-      break;
-
-    case OPT_dead_strip:
-      ctx.setDeadStripping(true);
-      break;
-
-    case OPT_keep_globals:
-      ctx.setGlobalsAreDeadStripRoots(true);
-      break;
-
-    case OPT_undefines_are_errors:
-      ctx.setPrintRemainingUndefines(true);
-      ctx.setAllowRemainingUndefines(false);
-      break;
-
-    case OPT_commons_search_archives:
-      ctx.setSearchArchivesToOverrideTentativeDefinitions(true);
-      break;
-
-    case OPT_add_pass:
-      ctx.addPassNamed(inputArg->getValue());
-      break;
-
-    case OPT_INPUT: {
-      std::vector<std::unique_ptr<File>> files
-        = loadFile(ctx, inputArg->getValue(), false);
-      for (std::unique_ptr<File> &file : files)
-        ctx.getNodes().push_back(llvm::make_unique<FileNode>(std::move(file)));
-      break;
-    }
-
-    default:
-      break;
-    }
-  }
-
-  parseLLVMOptions(ctx);
-
-  if (ctx.getNodes().empty()) {
-    diagnostics << "No input files\n";
-    return false;
-  }
-
-  // Validate the combination of options used.
-  return ctx.validate(diagnostics);
-}
-
-} // namespace lld
diff --git a/lib/Driver/CoreOptions.td b/lib/Driver/CoreOptions.td
deleted file mode 100644
index df7cb41737d2..000000000000
--- a/lib/Driver/CoreOptions.td
+++ /dev/null
@@ -1,15 +0,0 @@
-include "llvm/Option/OptParser.td"
-
-def output : Separate<["-"], "o">;
-def entry  : Separate<["-"], "e">;
-
-def dead_strip              : Flag<["--"], "dead-strip">;
-def undefines_are_errors    : Flag<["--"], "undefines-are-errors">;
-def keep_globals            : Flag<["--"], "keep-globals">;
-def commons_search_archives : Flag<["--"], "commons-search-archives">;
-
-def add_pass       : Separate<["--"], "add-pass">;
-
-def target : Separate<["-"], "target">, HelpText<"Target triple to link for">;
-def mllvm : Separate<["-"], "mllvm">, HelpText<"Options to pass to LLVM">;
-
diff --git a/lib/Driver/DarwinLdDriver.cpp b/lib/Driver/DarwinLdDriver.cpp
index 40fad74c9529..496b651bab4f 100644
--- a/lib/Driver/DarwinLdDriver.cpp
+++ b/lib/Driver/DarwinLdDriver.cpp
@@ -13,8 +13,11 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "lld/Core/File.h"
 #include "lld/Core/ArchiveLibraryFile.h"
+#include "lld/Core/File.h"
+#include "lld/Core/Instrumentation.h"
+#include "lld/Core/PassManager.h"
+#include "lld/Core/Resolver.h"
 #include "lld/Core/SharedLibraryFile.h"
 #include "lld/Driver/Driver.h"
 #include "lld/ReaderWriter/MachOLinkingContext.h"
@@ -25,17 +28,10 @@
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/Format.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MachO.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_ostream.h"
-#include <algorithm>
 
 using namespace lld;
 
@@ -72,6 +68,25 @@ public:
   DarwinLdOptTable() : OptTable(infoTable) {}
 };
 
+static std::vector<std::unique_ptr<File>>
+makeErrorFile(StringRef path, std::error_code ec) {
+  std::vector<std::unique_ptr<File>> result;
+  result.push_back(llvm::make_unique<ErrorFile>(path, ec));
+  return result;
+}
+
+static std::vector<std::unique_ptr<File>>
+parseMemberFiles(std::unique_ptr<File> file) {
+  std::vector<std::unique_ptr<File>> members;
+  if (auto *archive = dyn_cast<ArchiveLibraryFile>(file.get())) {
+    if (std::error_code ec = archive->parseAllMembers(members))
+      return makeErrorFile(file->path(), ec);
+  } else {
+    members.push_back(std::move(file));
+  }
+  return members;
+}
+
 std::vector<std::unique_ptr<File>>
 loadFile(MachOLinkingContext &ctx, StringRef path,
          raw_ostream &diag, bool wholeArchive, bool upwardDylib) {
@@ -215,9 +230,9 @@ static std::error_code parseOrderFile(StringRef orderFilePath,
 // In this variant, the path is to a text file which contains a partial path
 // per line. The <dir> prefix is prepended to each partial path.
 //
-static std::error_code loadFileList(StringRef fileListPath,
-                                    MachOLinkingContext &ctx, bool forceLoad,
-                                    raw_ostream &diagnostics) {
+static llvm::Error loadFileList(StringRef fileListPath,
+                                MachOLinkingContext &ctx, bool forceLoad,
+                                raw_ostream &diagnostics) {
   // If there is a comma, split off <dir>.
   std::pair<StringRef, StringRef> opt = fileListPath.split(',');
   StringRef filePath = opt.first;
@@ -227,7 +242,7 @@ static std::error_code loadFileList(StringRef fileListPath,
   ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
                                         MemoryBuffer::getFileOrSTDIN(filePath);
   if (std::error_code ec = mb.getError())
-    return ec;
+    return llvm::errorCodeToError(ec);
   StringRef buffer = mb->get()->getBuffer();
   while (!buffer.empty()) {
     // Split off each line in the file.
@@ -245,9 +260,9 @@ static std::error_code loadFileList(StringRef fileListPath,
       path = ctx.copy(line);
     }
     if (!ctx.pathExists(path)) {
-      return make_dynamic_error_code(Twine("File not found '")
-                                     + path
-                                     + "'");
+      return llvm::make_error<GenericError>(Twine("File not found '")
+                                            + path
+                                            + "'");
     }
     if (ctx.testingFileUsage()) {
       diagnostics << "Found filelist entry " << canonicalizePath(path) << '\n';
@@ -255,7 +270,7 @@ static std::error_code loadFileList(StringRef fileListPath,
     addFile(path, ctx, forceLoad, false, diagnostics);
     buffer = lineAndRest.second;
   }
-  return std::error_code();
+  return llvm::Error();
 }
 
 /// Parse number assuming it is base 16, but allow 0x prefix.
@@ -265,20 +280,24 @@ static bool parseNumberBase16(StringRef numStr, uint64_t &baseAddress) {
   return numStr.getAsInteger(16, baseAddress);
 }
 
-namespace lld {
-
-bool DarwinLdDriver::linkMachO(llvm::ArrayRef<const char *> args,
-                               raw_ostream &diagnostics) {
-  MachOLinkingContext ctx;
-  if (!parse(args, ctx, diagnostics))
-    return false;
-  if (ctx.doNothing())
-    return true;
-  return link(ctx, diagnostics);
+static void parseLLVMOptions(const LinkingContext &ctx) {
+  // Honor -mllvm
+  if (!ctx.llvmOptions().empty()) {
+    unsigned numArgs = ctx.llvmOptions().size();
+    auto **args = new const char *[numArgs + 2];
+    args[0] = "lld (LLVM option parsing)";
+    for (unsigned i = 0; i != numArgs; ++i)
+      args[i + 1] = ctx.llvmOptions()[i];
+    args[numArgs + 1] = nullptr;
+    llvm::cl::ParseCommandLineOptions(numArgs + 1, args);
+  }
 }
 
-bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
-                           MachOLinkingContext &ctx, raw_ostream &diagnostics) {
+namespace lld {
+namespace mach_o {
+
+bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx,
+           raw_ostream &diagnostics) {
   // Parse command line options using DarwinLdOptions.td
   DarwinLdOptTable table;
   unsigned missingIndex;
@@ -299,6 +318,7 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
 
   // Figure out output kind ( -dylib, -r, -bundle, -preload, or -static )
   llvm::MachO::HeaderFileType fileType = llvm::MachO::MH_EXECUTE;
+  bool isStaticExecutable = false;
   if (llvm::opt::Arg *kind = parsedArgs.getLastArg(
           OPT_dylib, OPT_relocatable, OPT_bundle, OPT_static, OPT_preload)) {
     switch (kind->getOption().getID()) {
@@ -313,6 +333,7 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
       break;
     case OPT_static:
       fileType = llvm::MachO::MH_EXECUTE;
+      isStaticExecutable = true;
       break;
     case OPT_preload:
       fileType = llvm::MachO::MH_PRELOAD;
@@ -350,7 +371,7 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
   }
 
   // Handle -macosx_version_min or -ios_version_min
-  MachOLinkingContext::OS os = MachOLinkingContext::OS::macOSX;
+  MachOLinkingContext::OS os = MachOLinkingContext::OS::unknown;
   uint32_t minOSVersion = 0;
   if (llvm::opt::Arg *minOS =
           parsedArgs.getLastArg(OPT_macosx_version_min, OPT_ios_version_min,
@@ -385,9 +406,16 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
     // No min-os version on command line, check environment variables
   }
 
+  // Handle export_dynamic
+  // FIXME: Should we warn when this applies to something other than a static
+  // executable or dylib?  Those are the only cases where this has an effect.
+  // Note, this has to come before ctx.configure() so that we get the correct
+  // value for _globalsAreDeadStripRoots.
+  bool exportDynamicSymbols = parsedArgs.hasArg(OPT_export_dynamic);
+
   // Now that there's enough information parsed in, let the linking context
   // set up default values.
-  ctx.configure(fileType, arch, os, minOSVersion);
+  ctx.configure(fileType, arch, os, minOSVersion, exportDynamicSymbols);
 
   // Handle -e xxx
   if (llvm::opt::Arg *entry = parsedArgs.getLastArg(OPT_entry))
@@ -673,6 +701,22 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
     }
   }
 
+  // Handle obsolete ObjC options: -objc_gc_compaction, -objc_gc, -objc_gc_only
+  if (parsedArgs.getLastArg(OPT_objc_gc_compaction)) {
+    diagnostics << "error: -objc_gc_compaction is not supported\n";
+    return false;
+  }
+
+  if (parsedArgs.getLastArg(OPT_objc_gc)) {
+    diagnostics << "error: -objc_gc is not supported\n";
+    return false;
+  }
+
+  if (parsedArgs.getLastArg(OPT_objc_gc_only)) {
+    diagnostics << "error: -objc_gc_only is not supported\n";
+    return false;
+  }
+
   // Handle -pie or -no_pie
   if (llvm::opt::Arg *pie = parsedArgs.getLastArg(OPT_pie, OPT_no_pie)) {
     switch (ctx.outputMachOType()) {
@@ -719,6 +763,182 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
     }
   }
 
+  // Handle -version_load_command or -no_version_load_command
+  {
+    bool flagOn = false;
+    bool flagOff = false;
+    if (auto *arg = parsedArgs.getLastArg(OPT_version_load_command,
+                                          OPT_no_version_load_command)) {
+      flagOn = arg->getOption().getID() == OPT_version_load_command;
+      flagOff = arg->getOption().getID() == OPT_no_version_load_command;
+    }
+
+    // default to adding version load command for dynamic code,
+    // static code must opt-in
+    switch (ctx.outputMachOType()) {
+      case llvm::MachO::MH_OBJECT:
+        ctx.setGenerateVersionLoadCommand(false);
+        break;
+      case llvm::MachO::MH_EXECUTE:
+        // dynamic executables default to generating a version load command,
+        // while static exectuables only generate it if required.
+        if (isStaticExecutable) {
+          if (flagOn)
+            ctx.setGenerateVersionLoadCommand(true);
+        } else {
+          if (!flagOff)
+            ctx.setGenerateVersionLoadCommand(true);
+        }
+        break;
+      case llvm::MachO::MH_PRELOAD:
+      case llvm::MachO::MH_KEXT_BUNDLE:
+        if (flagOn)
+          ctx.setGenerateVersionLoadCommand(true);
+        break;
+      case llvm::MachO::MH_DYLINKER:
+      case llvm::MachO::MH_DYLIB:
+      case llvm::MachO::MH_BUNDLE:
+        if (!flagOff)
+          ctx.setGenerateVersionLoadCommand(true);
+        break;
+      case llvm::MachO::MH_FVMLIB:
+      case llvm::MachO::MH_DYLDLINK:
+      case llvm::MachO::MH_DYLIB_STUB:
+      case llvm::MachO::MH_DSYM:
+        // We don't generate load commands for these file types, even if
+        // forced on.
+        break;
+    }
+  }
+
+  // Handle -function_starts or -no_function_starts
+  {
+    bool flagOn = false;
+    bool flagOff = false;
+    if (auto *arg = parsedArgs.getLastArg(OPT_function_starts,
+                                          OPT_no_function_starts)) {
+      flagOn = arg->getOption().getID() == OPT_function_starts;
+      flagOff = arg->getOption().getID() == OPT_no_function_starts;
+    }
+
+    // default to adding functions start for dynamic code, static code must
+    // opt-in
+    switch (ctx.outputMachOType()) {
+      case llvm::MachO::MH_OBJECT:
+        ctx.setGenerateFunctionStartsLoadCommand(false);
+        break;
+      case llvm::MachO::MH_EXECUTE:
+        // dynamic executables default to generating a version load command,
+        // while static exectuables only generate it if required.
+        if (isStaticExecutable) {
+          if (flagOn)
+            ctx.setGenerateFunctionStartsLoadCommand(true);
+        } else {
+          if (!flagOff)
+            ctx.setGenerateFunctionStartsLoadCommand(true);
+        }
+        break;
+      case llvm::MachO::MH_PRELOAD:
+      case llvm::MachO::MH_KEXT_BUNDLE:
+        if (flagOn)
+          ctx.setGenerateFunctionStartsLoadCommand(true);
+        break;
+      case llvm::MachO::MH_DYLINKER:
+      case llvm::MachO::MH_DYLIB:
+      case llvm::MachO::MH_BUNDLE:
+        if (!flagOff)
+          ctx.setGenerateFunctionStartsLoadCommand(true);
+        break;
+      case llvm::MachO::MH_FVMLIB:
+      case llvm::MachO::MH_DYLDLINK:
+      case llvm::MachO::MH_DYLIB_STUB:
+      case llvm::MachO::MH_DSYM:
+        // We don't generate load commands for these file types, even if
+        // forced on.
+        break;
+    }
+  }
+
+  // Handle -data_in_code_info or -no_data_in_code_info
+  {
+    bool flagOn = false;
+    bool flagOff = false;
+    if (auto *arg = parsedArgs.getLastArg(OPT_data_in_code_info,
+                                          OPT_no_data_in_code_info)) {
+      flagOn = arg->getOption().getID() == OPT_data_in_code_info;
+      flagOff = arg->getOption().getID() == OPT_no_data_in_code_info;
+    }
+
+    // default to adding data in code for dynamic code, static code must
+    // opt-in
+    switch (ctx.outputMachOType()) {
+      case llvm::MachO::MH_OBJECT:
+        if (!flagOff)
+          ctx.setGenerateDataInCodeLoadCommand(true);
+        break;
+      case llvm::MachO::MH_EXECUTE:
+        // dynamic executables default to generating a version load command,
+        // while static exectuables only generate it if required.
+        if (isStaticExecutable) {
+          if (flagOn)
+            ctx.setGenerateDataInCodeLoadCommand(true);
+        } else {
+          if (!flagOff)
+            ctx.setGenerateDataInCodeLoadCommand(true);
+        }
+        break;
+      case llvm::MachO::MH_PRELOAD:
+      case llvm::MachO::MH_KEXT_BUNDLE:
+        if (flagOn)
+          ctx.setGenerateDataInCodeLoadCommand(true);
+        break;
+      case llvm::MachO::MH_DYLINKER:
+      case llvm::MachO::MH_DYLIB:
+      case llvm::MachO::MH_BUNDLE:
+        if (!flagOff)
+          ctx.setGenerateDataInCodeLoadCommand(true);
+        break;
+      case llvm::MachO::MH_FVMLIB:
+      case llvm::MachO::MH_DYLDLINK:
+      case llvm::MachO::MH_DYLIB_STUB:
+      case llvm::MachO::MH_DSYM:
+        // We don't generate load commands for these file types, even if
+        // forced on.
+        break;
+    }
+  }
+
+  // Handle sdk_version
+  if (llvm::opt::Arg *arg = parsedArgs.getLastArg(OPT_sdk_version)) {
+    uint32_t sdkVersion = 0;
+    if (MachOLinkingContext::parsePackedVersion(arg->getValue(),
+                                                sdkVersion)) {
+      diagnostics << "error: malformed sdkVersion value\n";
+      return false;
+    }
+    ctx.setSdkVersion(sdkVersion);
+  } else if (ctx.generateVersionLoadCommand()) {
+    // If we don't have an sdk version, but were going to emit a load command
+    // with min_version, then we need to give an warning as we have no sdk
+    // version to put in that command.
+    // FIXME: We need to decide whether to make this an error.
+    diagnostics << "warning: -sdk_version is required when emitting "
+                   "min version load command.  "
+                   "Setting sdk version to match provided min version\n";
+    ctx.setSdkVersion(ctx.osMinVersion());
+  }
+
+  // Handle source_version
+  if (llvm::opt::Arg *arg = parsedArgs.getLastArg(OPT_source_version)) {
+    uint64_t version = 0;
+    if (MachOLinkingContext::parsePackedVersion(arg->getValue(),
+                                                version)) {
+      diagnostics << "error: malformed source_version value\n";
+      return false;
+    }
+    ctx.setSourceVersion(version);
+  }
+
   // Handle stack_size
   if (llvm::opt::Arg *stackSize = parsedArgs.getLastArg(OPT_stack_size)) {
     uint64_t stackSizeVal;
@@ -794,6 +1014,10 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
     ctx.setUndefinedMode(UndefMode);
   }
 
+  // Handle -no_objc_category_merging.
+  if (parsedArgs.getLastArg(OPT_no_objc_category_merging))
+    ctx.setMergeObjCCategories(false);
+
   // Handle -rpath <path>
   if (parsedArgs.hasArg(OPT_rpath)) {
     switch (ctx.outputMachOType()) {
@@ -829,7 +1053,7 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
   // Handle input files and sectcreate.
   for (auto &arg : parsedArgs) {
     bool upward;
-    ErrorOr<StringRef> resolvedPath = StringRef();
+    llvm::Optional<StringRef> resolvedPath;
     switch (arg->getOption().getID()) {
     default:
       continue;
@@ -852,9 +1076,10 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
         return false;
       } else if (ctx.testingFileUsage()) {
         diagnostics << "Found " << (upward ? "upward " : " ") << "library "
-                   << canonicalizePath(resolvedPath.get()) << '\n';
+                   << canonicalizePath(resolvedPath.getValue()) << '\n';
       }
-      addFile(resolvedPath.get(), ctx, globalWholeArchive, upward, diagnostics);
+      addFile(resolvedPath.getValue(), ctx, globalWholeArchive,
+              upward, diagnostics);
       break;
     case OPT_framework:
     case OPT_upward_framework:
@@ -866,17 +1091,20 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
         return false;
       } else if (ctx.testingFileUsage()) {
         diagnostics << "Found " << (upward ? "upward " : " ") << "framework "
-                    << canonicalizePath(resolvedPath.get()) << '\n';
+                    << canonicalizePath(resolvedPath.getValue()) << '\n';
       }
-      addFile(resolvedPath.get(), ctx, globalWholeArchive, upward, diagnostics);
+      addFile(resolvedPath.getValue(), ctx, globalWholeArchive,
+              upward, diagnostics);
       break;
     case OPT_filelist:
-      if (std::error_code ec = loadFileList(arg->getValue(),
-                                            ctx, globalWholeArchive,
-                                            diagnostics)) {
-        diagnostics << "error: " << ec.message()
-                    << ", processing '-filelist " << arg->getValue()
-                    << "'\n";
+      if (auto ec = loadFileList(arg->getValue(),
+                                 ctx, globalWholeArchive,
+                                 diagnostics)) {
+        handleAllErrors(std::move(ec), [&](const llvm::ErrorInfoBase &EI) {
+          diagnostics << "error: ";
+          EI.log(diagnostics);
+          diagnostics << ", processing '-filelist " << arg->getValue() << "'\n";
+        });
         return false;
       }
       break;
@@ -908,5 +1136,80 @@ bool DarwinLdDriver::parse(llvm::ArrayRef<const char *> args,
   return ctx.validate(diagnostics);
 }
 
+/// This is where the link is actually performed.
+bool link(llvm::ArrayRef<const char *> args, raw_ostream &diagnostics) {
+  MachOLinkingContext ctx;
+  if (!parse(args, ctx, diagnostics))
+    return false;
+  if (ctx.doNothing())
+    return true;
+  if (ctx.getNodes().empty())
+    return false;
+
+  for (std::unique_ptr<Node> &ie : ctx.getNodes())
+    if (FileNode *node = dyn_cast<FileNode>(ie.get()))
+      node->getFile()->parse();
+
+  std::vector<std::unique_ptr<File>> internalFiles;
+  ctx.createInternalFiles(internalFiles);
+  for (auto i = internalFiles.rbegin(), e = internalFiles.rend(); i != e; ++i) {
+    auto &members = ctx.getNodes();
+    members.insert(members.begin(), llvm::make_unique<FileNode>(std::move(*i)));
+  }
+
+  // Give target a chance to add files.
+  std::vector<std::unique_ptr<File>> implicitFiles;
+  ctx.createImplicitFiles(implicitFiles);
+  for (auto i = implicitFiles.rbegin(), e = implicitFiles.rend(); i != e; ++i) {
+    auto &members = ctx.getNodes();
+    members.insert(members.begin(), llvm::make_unique<FileNode>(std::move(*i)));
+  }
+
+  // Give target a chance to postprocess input files.
+  // Mach-O uses this chance to move all object files before library files.
+  ctx.finalizeInputFiles();
 
+  // Do core linking.
+  ScopedTask resolveTask(getDefaultDomain(), "Resolve");
+  Resolver resolver(ctx);
+  if (!resolver.resolve())
+    return false;
+  SimpleFile *merged = nullptr;
+  {
+    std::unique_ptr<SimpleFile> mergedFile = resolver.resultFile();
+    merged = mergedFile.get();
+    auto &members = ctx.getNodes();
+    members.insert(members.begin(),
+                   llvm::make_unique<FileNode>(std::move(mergedFile)));
+  }
+  resolveTask.end();
+
+  // Run passes on linked atoms.
+  ScopedTask passTask(getDefaultDomain(), "Passes");
+  PassManager pm;
+  ctx.addPasses(pm);
+  if (auto ec = pm.runOnFile(*merged)) {
+    // FIXME: This should be passed to logAllUnhandledErrors but it needs
+    // to be passed a Twine instead of a string.
+    diagnostics << "Failed to run passes on file '" << ctx.outputPath()
+                << "': ";
+    logAllUnhandledErrors(std::move(ec), diagnostics, std::string());
+    return false;
+  }
+
+  passTask.end();
+
+  // Give linked atoms to Writer to generate output file.
+  ScopedTask writeTask(getDefaultDomain(), "Write");
+  if (auto ec = ctx.writeFile(*merged)) {
+    // FIXME: This should be passed to logAllUnhandledErrors but it needs
+    // to be passed a Twine instead of a string.
+    diagnostics << "Failed to write file '" << ctx.outputPath() << "': ";
+    logAllUnhandledErrors(std::move(ec), diagnostics, std::string());
+    return false;
+  }
+
+  return true;
+}
+} // namespace mach_o
 } // namespace lld
diff --git a/lib/Driver/DarwinLdOptions.td b/lib/Driver/DarwinLdOptions.td
index cbf6ac1d4a4b..fa07f33646e7 100644
--- a/lib/Driver/DarwinLdOptions.td
+++ b/lib/Driver/DarwinLdOptions.td
@@ -33,6 +33,28 @@ def iphoneos_version_min : Separate<["-"], "iphoneos_version_min">,
 def ios_simulator_version_min : Separate<["-"], "ios_simulator_version_min">,
      MetaVarName<"<version>">,
      HelpText<"Minimum iOS simulator version">, Group<grp_opts>;
+def sdk_version : Separate<["-"], "sdk_version">,
+     MetaVarName<"<version>">,
+     HelpText<"SDK version">, Group<grp_opts>;
+def source_version : Separate<["-"], "source_version">,
+     MetaVarName<"<version>">,
+     HelpText<"Source version">, Group<grp_opts>;
+def version_load_command : Flag<["-"], "version_load_command">,
+     HelpText<"Force generation of a version load command">, Group<grp_opts>;
+def no_version_load_command : Flag<["-"], "no_version_load_command">,
+     HelpText<"Disable generation of a version load command">, Group<grp_opts>;
+def function_starts : Flag<["-"], "function_starts">,
+     HelpText<"Force generation of a function starts load command">,
+     Group<grp_opts>;
+def no_function_starts : Flag<["-"], "no_function_starts">,
+     HelpText<"Disable generation of a function starts load command">,
+     Group<grp_opts>;
+def data_in_code_info : Flag<["-"], "data_in_code_info">,
+     HelpText<"Force generation of a data in code load command">,
+     Group<grp_opts>;
+def no_data_in_code_info : Flag<["-"], "no_data_in_code_info">,
+     HelpText<"Disable generation of a data in code load command">,
+     Group<grp_opts>;
 def mllvm : Separate<["-"], "mllvm">,
      MetaVarName<"<option>">,
      HelpText<"Options to pass to LLVM during LTO">, Group<grp_opts>;
@@ -68,6 +90,10 @@ def undefined : Separate<["-"], "undefined">,
                 MetaVarName<"<undefined>">,
                 HelpText<"Determines how undefined symbols are handled.">,
                 Group<grp_opts>;
+def no_objc_category_merging : Flag<["-"], "no_objc_category_merging">,
+     HelpText<"Disables the optimisation which merges Objective-C categories "
+              "on a class in to the class itself.">,
+     Group<grp_opts>;
 
 // main executable options
 def grp_main : OptionGroup<"opts">, HelpText<"MAIN EXECUTABLE OPTIONS">;
@@ -84,6 +110,9 @@ def stack_size : Separate<["-"], "stack_size">,
      HelpText<"Specifies the maximum stack size for the main thread in a program. "
               "Must be a page-size multiple. (default=8Mb)">,
      Group<grp_main>;
+def export_dynamic : Flag<["-"], "export_dynamic">,
+     HelpText<"Preserves all global symbols in main executables during LTO">,
+     Group<grp_main>;
 
 // dylib executable options
 def grp_dylib : OptionGroup<"opts">, HelpText<"DYLIB EXECUTABLE OPTIONS">;
@@ -205,3 +234,9 @@ def single_module : Flag<["-"], "single_module">,
      HelpText<"Default for dylibs">, Group<grp_obsolete>;
 def multi_module : Flag<["-"], "multi_module">,
      HelpText<"Unsupported way to build dylibs">, Group<grp_obsolete>;
+def objc_gc_compaction : Flag<["-"], "objc_gc_compaction">,
+     HelpText<"Unsupported ObjC GC option">, Group<grp_obsolete>;
+def objc_gc : Flag<["-"], "objc_gc">,
+     HelpText<"Unsupported ObjC GC option">, Group<grp_obsolete>;
+def objc_gc_only : Flag<["-"], "objc_gc_only">,
+     HelpText<"Unsupported ObjC GC option">, Group<grp_obsolete>;
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
deleted file mode 100644
index 6a7a26b3b0f6..000000000000
--- a/lib/Driver/Driver.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//===- lib/Driver/Driver.cpp - Linker Driver Emulator -----------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lld/Core/ArchiveLibraryFile.h"
-#include "lld/Core/File.h"
-#include "lld/Core/Instrumentation.h"
-#include "lld/Core/LLVM.h"
-#include "lld/Core/Parallel.h"
-#include "lld/Core/PassManager.h"
-#include "lld/Core/Reader.h"
-#include "lld/Core/Resolver.h"
-#include "lld/Core/Writer.h"
-#include "lld/Driver/Driver.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/Process.h"
-#include "llvm/Support/raw_ostream.h"
-#include <mutex>
-
-namespace lld {
-
-FileVector makeErrorFile(StringRef path, std::error_code ec) {
-  std::vector<std::unique_ptr<File>> result;
-  result.push_back(llvm::make_unique<ErrorFile>(path, ec));
-  return result;
-}
-
-FileVector parseMemberFiles(std::unique_ptr<File> file) {
-  std::vector<std::unique_ptr<File>> members;
-  if (auto *archive = dyn_cast<ArchiveLibraryFile>(file.get())) {
-    if (std::error_code ec = archive->parseAllMembers(members))
-      return makeErrorFile(file->path(), ec);
-  } else {
-    members.push_back(std::move(file));
-  }
-  return members;
-}
-
-FileVector loadFile(LinkingContext &ctx, StringRef path, bool wholeArchive) {
-  ErrorOr<std::unique_ptr<MemoryBuffer>> mb
-      = MemoryBuffer::getFileOrSTDIN(path);
-  if (std::error_code ec = mb.getError())
-    return makeErrorFile(path, ec);
-  ErrorOr<std::unique_ptr<File>> fileOrErr =
-      ctx.registry().loadFile(std::move(mb.get()));
-  if (std::error_code ec = fileOrErr.getError())
-    return makeErrorFile(path, ec);
-  std::unique_ptr<File> &file = fileOrErr.get();
-  if (wholeArchive)
-    return parseMemberFiles(std::move(file));
-  std::vector<std::unique_ptr<File>> files;
-  files.push_back(std::move(file));
-  return files;
-}
-
-void Driver::parseLLVMOptions(const LinkingContext &ctx) {
-  // Honor -mllvm
-  if (!ctx.llvmOptions().empty()) {
-    unsigned numArgs = ctx.llvmOptions().size();
-    auto **args = new const char *[numArgs + 2];
-    args[0] = "lld (LLVM option parsing)";
-    for (unsigned i = 0; i != numArgs; ++i)
-      args[i + 1] = ctx.llvmOptions()[i];
-    args[numArgs + 1] = nullptr;
-    llvm::cl::ParseCommandLineOptions(numArgs + 1, args);
-  }
-}
-
-/// This is where the link is actually performed.
-bool Driver::link(LinkingContext &ctx, raw_ostream &diagnostics) {
-  if (ctx.getNodes().empty())
-    return false;
-
-  for (std::unique_ptr<Node> &ie : ctx.getNodes())
-    if (FileNode *node = dyn_cast<FileNode>(ie.get()))
-      ctx.getTaskGroup().spawn([node] { node->getFile()->parse(); });
-
-  std::vector<std::unique_ptr<File>> internalFiles;
-  ctx.createInternalFiles(internalFiles);
-  for (auto i = internalFiles.rbegin(), e = internalFiles.rend(); i != e; ++i) {
-    auto &members = ctx.getNodes();
-    members.insert(members.begin(), llvm::make_unique<FileNode>(std::move(*i)));
-  }
-
-  // Give target a chance to add files.
-  std::vector<std::unique_ptr<File>> implicitFiles;
-  ctx.createImplicitFiles(implicitFiles);
-  for (auto i = implicitFiles.rbegin(), e = implicitFiles.rend(); i != e; ++i) {
-    auto &members = ctx.getNodes();
-    members.insert(members.begin(), llvm::make_unique<FileNode>(std::move(*i)));
-  }
-
-  // Give target a chance to postprocess input files.
-  // Mach-O uses this chance to move all object files before library files.
-  // ELF adds specific undefined symbols resolver.
-  ctx.finalizeInputFiles();
-
-  // Do core linking.
-  ScopedTask resolveTask(getDefaultDomain(), "Resolve");
-  Resolver resolver(ctx);
-  if (!resolver.resolve()) {
-    ctx.getTaskGroup().sync();
-    return false;
-  }
-  std::unique_ptr<SimpleFile> merged = resolver.resultFile();
-  resolveTask.end();
-
-  // Run passes on linked atoms.
-  ScopedTask passTask(getDefaultDomain(), "Passes");
-  PassManager pm;
-  ctx.addPasses(pm);
-  if (std::error_code ec = pm.runOnFile(*merged)) {
-    diagnostics << "Failed to write file '" << ctx.outputPath()
-                << "': " << ec.message() << "\n";
-    return false;
-  }
-
-  passTask.end();
-
-  // Give linked atoms to Writer to generate output file.
-  ScopedTask writeTask(getDefaultDomain(), "Write");
-  if (std::error_code ec = ctx.writeFile(*merged)) {
-    diagnostics << "Failed to write file '" << ctx.outputPath()
-                << "': " << ec.message() << "\n";
-    return false;
-  }
-
-  return true;
-}
-
-} // namespace lld
diff --git a/lib/Driver/GnuLdDriver.cpp b/lib/Driver/GnuLdDriver.cpp
deleted file mode 100644
index 1cff481dd8d7..000000000000
--- a/lib/Driver/GnuLdDriver.cpp
+++ /dev/null
@@ -1,782 +0,0 @@
-//===- lib/Driver/GnuLdDriver.cpp -----------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-///
-/// Concrete instance of the Driver for GNU's ld.
-///
-//===----------------------------------------------------------------------===//
-
-#include "lld/Driver/Driver.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "lld/ReaderWriter/LinkerScript.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/Triple.h"
-#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"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/StringSaver.h"
-#include "llvm/Support/Timer.h"
-#include "llvm/Support/raw_ostream.h"
-#include <cstring>
-#include <tuple>
-
-using namespace lld;
-
-using llvm::BumpPtrAllocator;
-
-namespace {
-
-// Create enum with OPT_xxx values for each option in GnuLdOptions.td
-enum {
-  OPT_INVALID = 0,
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELP, META) \
-          OPT_##ID,
-#include "GnuLdOptions.inc"
-#undef OPTION
-};
-
-// Create prefix string literals used in GnuLdOptions.td
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
-#include "GnuLdOptions.inc"
-#undef PREFIX
-
-// Create table mapping all options defined in GnuLdOptions.td
-static const llvm::opt::OptTable::Info infoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
-               HELPTEXT, METAVAR)   \
-  { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, llvm::opt::Option::KIND##Class, \
-    PARAM, FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS },
-#include "GnuLdOptions.inc"
-#undef OPTION
-};
-
-
-// Create OptTable class for parsing actual command line arguments
-class GnuLdOptTable : public llvm::opt::OptTable {
-public:
-  GnuLdOptTable() : OptTable(infoTable){}
-};
-
-} // anonymous namespace
-
-// If a command line option starts with "@", the driver reads its suffix as a
-// file, parse its contents as a list of command line options, and insert them
-// at the original @file position. If file cannot be read, @file is not expanded
-// and left unmodified. @file can appear in a response file, so it's a recursive
-// process.
-static llvm::ArrayRef<const char *>
-maybeExpandResponseFiles(llvm::ArrayRef<const char *> args,
-                         BumpPtrAllocator &alloc) {
-  // Expand response files.
-  SmallVector<const char *, 256> smallvec;
-  for (const char *arg : args)
-    smallvec.push_back(arg);
-  llvm::StringSaver saver(alloc);
-  llvm::cl::ExpandResponseFiles(saver, llvm::cl::TokenizeGNUCommandLine, smallvec);
-
-  // Pack the results to a C-array and return it.
-  const char **copy = alloc.Allocate<const char *>(smallvec.size() + 1);
-  std::copy(smallvec.begin(), smallvec.end(), copy);
-  copy[smallvec.size()] = nullptr;
-  return llvm::makeArrayRef(copy, smallvec.size() + 1);
-}
-
-// Parses an argument of --defsym=<sym>=<number>
-static bool parseDefsymAsAbsolute(StringRef opt, StringRef &sym,
-                                  uint64_t &addr) {
-  size_t equalPos = opt.find('=');
-  if (equalPos == 0 || equalPos == StringRef::npos)
-    return false;
-  sym = opt.substr(0, equalPos);
-  if (opt.substr(equalPos + 1).getAsInteger(0, addr))
-    return false;
-  return true;
-}
-
-// Parses an argument of --defsym=<sym>=<sym>
-static bool parseDefsymAsAlias(StringRef opt, StringRef &sym,
-                               StringRef &target) {
-  size_t equalPos = opt.find('=');
-  if (equalPos == 0 || equalPos == StringRef::npos)
-    return false;
-  sym = opt.substr(0, equalPos);
-  target = opt.substr(equalPos + 1);
-  return !target.empty();
-}
-
-// Parses -z max-page-size=<value>
-static bool parseMaxPageSize(StringRef opt, uint64_t &val) {
-  size_t equalPos = opt.find('=');
-  if (equalPos == 0 || equalPos == StringRef::npos)
-    return false;
-  StringRef value = opt.substr(equalPos + 1);
-  val = 0;
-  if (value.getAsInteger(0, val) || !val)
-    return false;
-  return true;
-}
-
-bool GnuLdDriver::linkELF(llvm::ArrayRef<const char *> args,
-                          raw_ostream &diag) {
-  BumpPtrAllocator alloc;
-  args = maybeExpandResponseFiles(args, alloc);
-  std::unique_ptr<ELFLinkingContext> options;
-  if (!parse(args, options, diag))
-    return false;
-  if (!options)
-    return true;
-  bool linked = link(*options, diag);
-
-  // Handle --stats.
-  if (options->collectStats()) {
-    llvm::TimeRecord t = llvm::TimeRecord::getCurrentTime(true);
-    diag << "total time in link " << t.getProcessTime() << "\n";
-    diag << "data size " << t.getMemUsed() << "\n";
-  }
-  return linked;
-}
-
-static llvm::Optional<llvm::Triple::ArchType>
-getArchType(const llvm::Triple &triple, StringRef value) {
-  switch (triple.getArch()) {
-  case llvm::Triple::x86:
-  case llvm::Triple::x86_64:
-    if (value == "elf_i386")
-      return llvm::Triple::x86;
-    if (value == "elf_x86_64")
-      return llvm::Triple::x86_64;
-    return llvm::None;
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-    return llvm::StringSwitch<llvm::Optional<llvm::Triple::ArchType>>(value)
-        .Cases("elf32btsmip", "elf32btsmipn32", llvm::Triple::mips)
-        .Cases("elf32ltsmip", "elf32ltsmipn32", llvm::Triple::mipsel)
-        .Case("elf64btsmip", llvm::Triple::mips64)
-        .Case("elf64ltsmip", llvm::Triple::mips64el)
-        .Default(llvm::None);
-  case llvm::Triple::aarch64:
-    if (value == "aarch64linux")
-      return llvm::Triple::aarch64;
-    return llvm::None;
-  case llvm::Triple::arm:
-    if (value == "armelf_linux_eabi")
-      return llvm::Triple::arm;
-    return llvm::None;
-  default:
-    return llvm::None;
-  }
-}
-
-static bool isLinkerScript(StringRef path, raw_ostream &diag) {
-  llvm::sys::fs::file_magic magic = llvm::sys::fs::file_magic::unknown;
-  if (std::error_code ec = llvm::sys::fs::identify_magic(path, magic)) {
-    diag << "unknown input file format: " << path << ": "
-         << ec.message() << "\n";
-    return false;
-  }
-  return magic == llvm::sys::fs::file_magic::unknown;
-}
-
-static ErrorOr<StringRef>
-findFile(ELFLinkingContext &ctx, StringRef path, bool dashL) {
-  // If the path was referred to by using a -l argument, let's search
-  // for the file in the search path.
-  if (dashL) {
-    ErrorOr<StringRef> pathOrErr = ctx.searchLibrary(path);
-    if (std::error_code ec = pathOrErr.getError())
-      return make_dynamic_error_code(
-          Twine("Unable to find library -l") + path + ": " + ec.message());
-    path = pathOrErr.get();
-  }
-  if (!llvm::sys::fs::exists(path))
-    return make_dynamic_error_code(
-        Twine("lld: cannot find file ") + path);
-  return path;
-}
-
-static bool isPathUnderSysroot(StringRef sysroot, StringRef path) {
-  if (sysroot.empty())
-    return false;
-  while (!path.empty() && !llvm::sys::fs::equivalent(sysroot, path))
-    path = llvm::sys::path::parent_path(path);
-  return !path.empty();
-}
-
-static std::error_code
-addFilesFromLinkerScript(ELFLinkingContext &ctx, StringRef scriptPath,
-                         const std::vector<script::Path> &inputPaths,
-                         raw_ostream &diag) {
-  bool sysroot = (!ctx.getSysroot().empty()
-                  && isPathUnderSysroot(ctx.getSysroot(), scriptPath));
-  for (const script::Path &path : inputPaths) {
-    ErrorOr<StringRef> pathOrErr = path._isDashlPrefix
-      ? ctx.searchLibrary(path._path) : ctx.searchFile(path._path, sysroot);
-    if (std::error_code ec = pathOrErr.getError()) {
-      auto file = llvm::make_unique<ErrorFile>(path._path, ec);
-      ctx.getNodes().push_back(llvm::make_unique<FileNode>(std::move(file)));
-      continue;
-    }
-
-    std::vector<std::unique_ptr<File>> files
-      = loadFile(ctx, pathOrErr.get(), false);
-    for (std::unique_ptr<File> &file : files) {
-      if (ctx.logInputFiles())
-        diag << file->path() << "\n";
-      ctx.getNodes().push_back(llvm::make_unique<FileNode>(std::move(file)));
-    }
-  }
-  return std::error_code();
-}
-
-std::error_code GnuLdDriver::evalLinkerScript(ELFLinkingContext &ctx,
-                                              std::unique_ptr<MemoryBuffer> mb,
-                                              raw_ostream &diag,
-                                              bool nostdlib) {
-  // Read the script file from disk and parse.
-  StringRef path = mb->getBufferIdentifier();
-  auto parser = llvm::make_unique<script::Parser>(std::move(mb));
-  if (std::error_code ec = parser->parse())
-    return ec;
-  script::LinkerScript *script = parser->get();
-  if (!script)
-    return LinkerScriptReaderError::parse_error;
-  // Evaluate script commands.
-  // Currently we only recognize this subset of linker script commands.
-  for (const script::Command *c : script->_commands) {
-    if (auto *input = dyn_cast<script::Input>(c))
-      if (std::error_code ec = addFilesFromLinkerScript(
-            ctx, path, input->getPaths(), diag))
-        return ec;
-    if (auto *group = dyn_cast<script::Group>(c)) {
-      int origSize = ctx.getNodes().size();
-      if (std::error_code ec = addFilesFromLinkerScript(
-            ctx, path, group->getPaths(), diag))
-        return ec;
-      size_t groupSize = ctx.getNodes().size() - origSize;
-      ctx.getNodes().push_back(llvm::make_unique<GroupEnd>(groupSize));
-    }
-    if (auto *searchDir = dyn_cast<script::SearchDir>(c))
-      if (!nostdlib)
-        ctx.addSearchPath(searchDir->getSearchPath());
-    if (auto *entry = dyn_cast<script::Entry>(c))
-      ctx.setEntrySymbolName(entry->getEntryName());
-    if (auto *output = dyn_cast<script::Output>(c))
-      ctx.setOutputPath(output->getOutputFileName());
-    if (auto *externs = dyn_cast<script::Extern>(c)) {
-      for (auto symbol : *externs) {
-        ctx.addInitialUndefinedSymbol(symbol);
-      }
-    }
-  }
-  // Transfer ownership of the script to the linking context
-  ctx.linkerScriptSema().addLinkerScript(std::move(parser));
-  return std::error_code();
-}
-
-bool GnuLdDriver::applyEmulation(llvm::Triple &triple,
-                                 llvm::opt::InputArgList &args,
-                                 raw_ostream &diag) {
-  llvm::opt::Arg *arg = args.getLastArg(OPT_m);
-  if (!arg)
-    return true;
-  llvm::Optional<llvm::Triple::ArchType> arch =
-      getArchType(triple, arg->getValue());
-  if (!arch) {
-    diag << "error: unsupported emulation '" << arg->getValue() << "'.\n";
-    return false;
-  }
-  triple.setArch(*arch);
-  return true;
-}
-
-void GnuLdDriver::addPlatformSearchDirs(ELFLinkingContext &ctx,
-                                        llvm::Triple &triple,
-                                        llvm::Triple &baseTriple) {
-  if (triple.getOS() == llvm::Triple::NetBSD &&
-      triple.getArch() == llvm::Triple::x86 &&
-      baseTriple.getArch() == llvm::Triple::x86_64) {
-    ctx.addSearchPath("=/usr/lib/i386");
-    return;
-  }
-  ctx.addSearchPath("=/usr/lib");
-}
-
-std::unique_ptr<ELFLinkingContext>
-GnuLdDriver::createELFLinkingContext(llvm::Triple triple) {
-  std::unique_ptr<ELFLinkingContext> p;
-  if ((p = elf::createAArch64LinkingContext(triple))) return p;
-  if ((p = elf::createARMLinkingContext(triple))) return p;
-  if ((p = elf::createExampleLinkingContext(triple))) return p;
-  if ((p = elf::createHexagonLinkingContext(triple))) return p;
-  if ((p = elf::createMipsLinkingContext(triple))) return p;
-  if ((p = elf::createX86LinkingContext(triple))) return p;
-  if ((p = elf::createX86_64LinkingContext(triple))) return p;
-  return nullptr;
-}
-
-static llvm::Optional<bool>
-getBool(const llvm::opt::InputArgList &parsedArgs,
-        unsigned yesFlag, unsigned noFlag) {
-  if (auto *arg = parsedArgs.getLastArg(yesFlag, noFlag))
-    return arg->getOption().getID() == yesFlag;
-  return llvm::None;
-}
-
-bool GnuLdDriver::parse(llvm::ArrayRef<const char *> args,
-                        std::unique_ptr<ELFLinkingContext> &context,
-                        raw_ostream &diag) {
-  // Parse command line options using GnuLdOptions.td
-  GnuLdOptTable table;
-  unsigned missingIndex;
-  unsigned missingCount;
-
-  llvm::opt::InputArgList parsedArgs =
-      table.ParseArgs(args.slice(1), missingIndex, missingCount);
-  if (missingCount) {
-    diag << "error: missing arg value for '"
-         << parsedArgs.getArgString(missingIndex) << "' expected "
-         << missingCount << " argument(s).\n";
-    return false;
-  }
-
-  // Handle --help
-  if (parsedArgs.hasArg(OPT_help)) {
-    table.PrintHelp(llvm::outs(), args[0], "LLVM Linker", false);
-    return true;
-  }
-
-  // Use -target or use default target triple to instantiate LinkingContext
-  llvm::Triple baseTriple;
-  if (auto *arg = parsedArgs.getLastArg(OPT_target)) {
-    baseTriple = llvm::Triple(arg->getValue());
-  } else {
-    baseTriple = getDefaultTarget(args[0]);
-  }
-  llvm::Triple triple(baseTriple);
-
-  if (!applyEmulation(triple, parsedArgs, diag))
-    return false;
-
-  std::unique_ptr<ELFLinkingContext> ctx(createELFLinkingContext(triple));
-
-  if (!ctx) {
-    diag << "unknown target triple\n";
-    return false;
-  }
-
-  // Copy mllvm
-  for (auto *arg : parsedArgs.filtered(OPT_mllvm))
-    ctx->appendLLVMOption(arg->getValue());
-
-  // Ignore unknown arguments.
-  for (auto unknownArg : parsedArgs.filtered(OPT_UNKNOWN))
-    diag << "warning: ignoring unknown argument: "
-         << unknownArg->getValue() << "\n";
-
-  // Set sys root path.
-  if (auto *arg = parsedArgs.getLastArg(OPT_sysroot))
-    ctx->setSysroot(arg->getValue());
-
-  // Handle --demangle option(For compatibility)
-  if (parsedArgs.hasArg(OPT_demangle))
-    ctx->setDemangleSymbols(true);
-
-  // Handle --no-demangle option.
-  if (parsedArgs.hasArg(OPT_no_demangle))
-    ctx->setDemangleSymbols(false);
-
-  // Figure out output kind (-r, -static, -shared)
-  if (parsedArgs.hasArg(OPT_relocatable)) {
-    ctx->setOutputELFType(llvm::ELF::ET_REL);
-    ctx->setPrintRemainingUndefines(false);
-    ctx->setAllowRemainingUndefines(true);
-  }
-
-  if (parsedArgs.hasArg(OPT_static)) {
-    ctx->setOutputELFType(llvm::ELF::ET_EXEC);
-    ctx->setIsStaticExecutable(true);
-  }
-
-  if (parsedArgs.hasArg(OPT_shared)) {
-    ctx->setOutputELFType(llvm::ELF::ET_DYN);
-    ctx->setAllowShlibUndefines(true);
-    ctx->setUseShlibUndefines(false);
-    ctx->setPrintRemainingUndefines(false);
-    ctx->setAllowRemainingUndefines(true);
-  }
-
-  // Handle --stats.
-  if (parsedArgs.hasArg(OPT_stats)) {
-    ctx->setCollectStats(true);
-  }
-
-  // Figure out if the output type is nmagic/omagic
-  if (auto *arg =
-          parsedArgs.getLastArg(OPT_nmagic, OPT_omagic, OPT_no_omagic)) {
-    switch (arg->getOption().getID()) {
-    case OPT_nmagic:
-      ctx->setOutputMagic(ELFLinkingContext::OutputMagic::NMAGIC);
-      ctx->setIsStaticExecutable(true);
-      break;
-    case OPT_omagic:
-      ctx->setOutputMagic(ELFLinkingContext::OutputMagic::OMAGIC);
-      ctx->setIsStaticExecutable(true);
-      break;
-    case OPT_no_omagic:
-      ctx->setOutputMagic(ELFLinkingContext::OutputMagic::DEFAULT);
-      ctx->setNoAllowDynamicLibraries();
-      break;
-    }
-  }
-
-  if (parsedArgs.hasArg(OPT_discard_loc))
-    ctx->setDiscardLocals(true);
-
-  if (parsedArgs.hasArg(OPT_discard_temp_loc))
-    ctx->setDiscardTempLocals(true);
-
-  if (parsedArgs.hasArg(OPT_strip_all))
-    ctx->setStripSymbols(true);
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_soname))
-    ctx->setSharedObjectName(arg->getValue());
-
-  if (parsedArgs.hasArg(OPT_rosegment))
-    ctx->setCreateSeparateROSegment();
-
-  if (parsedArgs.hasArg(OPT_no_align_segments))
-    ctx->setAlignSegments(false);
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_image_base)) {
-    uint64_t baseAddress = 0;
-    StringRef inputValue = arg->getValue();
-    if (inputValue.getAsInteger(0, baseAddress) || !baseAddress) {
-      diag << "invalid value for image base " << inputValue << "\n";
-      return false;
-    }
-    ctx->setBaseAddress(baseAddress);
-  }
-
-  if (parsedArgs.hasArg(OPT_merge_strings))
-    ctx->setMergeCommonStrings(true);
-
-  if (parsedArgs.hasArg(OPT_t))
-    ctx->setLogInputFiles(true);
-
-  if (parsedArgs.hasArg(OPT_use_shlib_undefs))
-    ctx->setUseShlibUndefines(true);
-
-  if (auto val = getBool(parsedArgs, OPT_allow_shlib_undefs,
-                         OPT_no_allow_shlib_undefs))
-    ctx->setAllowShlibUndefines(*val);
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_e))
-    ctx->setEntrySymbolName(arg->getValue());
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_output))
-    ctx->setOutputPath(arg->getValue());
-
-  if (parsedArgs.hasArg(OPT_noinhibit_exec))
-    ctx->setAllowRemainingUndefines(true);
-
-  if (auto val = getBool(parsedArgs, OPT_export_dynamic, OPT_no_export_dynamic))
-    ctx->setExportDynamic(*val);
-
-  if (parsedArgs.hasArg(OPT_allow_multiple_definition))
-    ctx->setAllowDuplicates(true);
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_dynamic_linker))
-    ctx->setInterpreter(arg->getValue());
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_init))
-    ctx->setInitFunction(arg->getValue());
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_fini))
-    ctx->setFiniFunction(arg->getValue());
-
-  if (auto *arg = parsedArgs.getLastArg(OPT_output_filetype))
-    ctx->setOutputFileType(arg->getValue());
-
-  // Process ELF/ARM specific options
-  bool hasArmTarget1Rel = parsedArgs.hasArg(OPT_target1_rel);
-  bool hasArmTarget1Abs = parsedArgs.hasArg(OPT_target1_abs);
-  if (triple.getArch() == llvm::Triple::arm) {
-    if (hasArmTarget1Rel && hasArmTarget1Abs) {
-      diag << "error: options --target1-rel and --target1-abs"
-              " can't be used together.\n";
-      return false;
-    } else if (hasArmTarget1Rel || hasArmTarget1Abs) {
-      ctx->setArmTarget1Rel(hasArmTarget1Rel && !hasArmTarget1Abs);
-    }
-  } else {
-    for (const auto *arg : parsedArgs.filtered(OPT_grp_arm_targetopts)) {
-      diag << "warning: ignoring unsupported ARM/ELF specific argument: "
-           << arg->getSpelling() << "\n";
-    }
-  }
-
-  // Process MIPS specific options.
-  if (triple.getArch() == llvm::Triple::mips ||
-      triple.getArch() == llvm::Triple::mipsel ||
-      triple.getArch() == llvm::Triple::mips64 ||
-      triple.getArch() == llvm::Triple::mips64el) {
-    ctx->setMipsPcRelEhRel(parsedArgs.hasArg(OPT_pcrel_eh_reloc));
-    auto *hashArg = parsedArgs.getLastArg(OPT_hash_style);
-    if (hashArg && hashArg->getValue() != StringRef("sysv")) {
-      diag << "error: .gnu.hash is incompatible with the MIPS ABI\n";
-      return false;
-    }
-  }
-  else {
-    for (const auto *arg : parsedArgs.filtered(OPT_grp_mips_targetopts)) {
-      diag << "warning: ignoring unsupported MIPS specific argument: "
-           << arg->getSpelling() << "\n";
-    }
-  }
-
-  for (auto *arg : parsedArgs.filtered(OPT_L))
-    ctx->addSearchPath(arg->getValue());
-
-  // Add the default search directory specific to the target.
-  if (!parsedArgs.hasArg(OPT_nostdlib))
-    addPlatformSearchDirs(*ctx, triple, baseTriple);
-
-  for (auto *arg : parsedArgs.filtered(OPT_u))
-    ctx->addInitialUndefinedSymbol(arg->getValue());
-
-  for (auto *arg : parsedArgs.filtered(OPT_defsym)) {
-    StringRef sym, target;
-    uint64_t addr;
-    if (parseDefsymAsAbsolute(arg->getValue(), sym, addr)) {
-      ctx->addInitialAbsoluteSymbol(sym, addr);
-    } else if (parseDefsymAsAlias(arg->getValue(), sym, target)) {
-      ctx->addAlias(sym, target);
-    } else {
-      diag << "invalid --defsym: " << arg->getValue() << "\n";
-      return false;
-    }
-  }
-
-  for (auto *arg : parsedArgs.filtered(OPT_z)) {
-    StringRef opt = arg->getValue();
-    if (opt == "muldefs")
-      ctx->setAllowDuplicates(true);
-    else if (opt == "now")
-      ctx->setDTFlag(ELFLinkingContext::DTFlag::DT_NOW);
-    else if (opt == "origin")
-      ctx->setDTFlag(ELFLinkingContext::DTFlag::DT_ORIGIN);
-    else if (opt.startswith("max-page-size")) {
-      // Parse -z max-page-size option.
-      // The default page size is considered the minimum page size the user
-      // can set, check the user input if its atleast the minimum page size
-      // and does not exceed the maximum page size allowed for the target.
-      uint64_t maxPageSize = 0;
-
-      // Error if the page size user set is less than the maximum page size
-      // and greather than the default page size and the user page size is a
-      // modulo of the default page size.
-      if ((!parseMaxPageSize(opt, maxPageSize)) ||
-          (maxPageSize < ctx->getPageSize()) ||
-          (maxPageSize % ctx->getPageSize())) {
-        diag << "invalid option: " << opt << "\n";
-        return false;
-      }
-      ctx->setMaxPageSize(maxPageSize);
-    } else {
-      diag << "warning: ignoring unknown argument for -z: " << opt << "\n";
-    }
-  }
-
-  for (auto *arg : parsedArgs.filtered(OPT_rpath)) {
-    SmallVector<StringRef, 2> rpaths;
-    StringRef(arg->getValue()).split(rpaths, ":");
-    for (auto path : rpaths)
-      ctx->addRpath(path);
-  }
-
-  for (auto *arg : parsedArgs.filtered(OPT_rpath_link)) {
-    SmallVector<StringRef, 2> rpaths;
-    StringRef(arg->getValue()).split(rpaths, ":");
-    for (auto path : rpaths)
-      ctx->addRpathLink(path);
-  }
-
-  // Enable new dynamic tags.
-  if (parsedArgs.hasArg(OPT_enable_newdtags))
-    ctx->setEnableNewDtags(true);
-
-  // Support --wrap option.
-  for (auto *arg : parsedArgs.filtered(OPT_wrap))
-    ctx->addWrapForSymbol(arg->getValue());
-
-  // Register possible input file parsers.
-  ctx->registry().addSupportELFObjects(*ctx);
-  ctx->registry().addSupportArchives(ctx->logInputFiles());
-  ctx->registry().addSupportYamlFiles();
-  if (ctx->allowLinkWithDynamicLibraries())
-    ctx->registry().addSupportELFDynamicSharedObjects(*ctx);
-
-  // Parse the LLVM options before we process files in case the file handling
-  // makes use of things like DEBUG().
-  parseLLVMOptions(*ctx);
-
-  std::stack<int> groupStack;
-  int numfiles = 0;
-  bool asNeeded = false;
-  bool wholeArchive = false;
-
-  // Process files
-  for (auto arg : parsedArgs) {
-    switch (arg->getOption().getID()) {
-    case OPT_no_whole_archive:
-      wholeArchive = false;
-      break;
-
-    case OPT_whole_archive:
-      wholeArchive = true;
-      break;
-
-    case OPT_as_needed:
-      asNeeded = true;
-      break;
-
-    case OPT_no_as_needed:
-      asNeeded = false;
-      break;
-
-    case OPT_start_group:
-      groupStack.push(numfiles);
-      break;
-
-    case OPT_end_group: {
-      if (groupStack.empty()) {
-        diag << "stray --end-group\n";
-        return false;
-      }
-      int startGroupPos = groupStack.top();
-      ctx->getNodes().push_back(
-          llvm::make_unique<GroupEnd>(numfiles - startGroupPos));
-      groupStack.pop();
-      break;
-    }
-
-    case OPT_INPUT:
-    case OPT_l:
-    case OPT_T: {
-      bool dashL = (arg->getOption().getID() == OPT_l);
-      StringRef path = arg->getValue();
-
-      ErrorOr<StringRef> pathOrErr = findFile(*ctx, path, dashL);
-      if (std::error_code ec = pathOrErr.getError()) {
-        auto file = llvm::make_unique<ErrorFile>(path, ec);
-        auto node = llvm::make_unique<FileNode>(std::move(file));
-        node->setAsNeeded(asNeeded);
-        ctx->getNodes().push_back(std::move(node));
-        break;
-      }
-      StringRef realpath = pathOrErr.get();
-
-      bool isScript =
-          (!path.endswith(".objtxt") && isLinkerScript(realpath, diag));
-      if (isScript) {
-        if (ctx->logInputFiles())
-          diag << path << "\n";
-        ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
-          MemoryBuffer::getFileOrSTDIN(realpath);
-        if (std::error_code ec = mb.getError()) {
-          diag << "Cannot open " << path << ": " << ec.message() << "\n";
-          return false;
-        }
-        bool nostdlib = parsedArgs.hasArg(OPT_nostdlib);
-        std::error_code ec =
-            evalLinkerScript(*ctx, std::move(mb.get()), diag, nostdlib);
-        if (ec) {
-          diag << path << ": Error parsing linker script: "
-               << ec.message() << "\n";
-          return false;
-        }
-        break;
-      }
-      std::vector<std::unique_ptr<File>> files
-          = loadFile(*ctx, realpath, wholeArchive);
-      for (std::unique_ptr<File> &file : files) {
-        if (ctx->logInputFiles())
-          diag << file->path() << "\n";
-        auto node = llvm::make_unique<FileNode>(std::move(file));
-        node->setAsNeeded(asNeeded);
-        ctx->getNodes().push_back(std::move(node));
-      }
-      numfiles += files.size();
-      break;
-    }
-    }
-  }
-
-  if (ctx->getNodes().empty()) {
-    diag << "No input files\n";
-    return false;
-  }
-
-  // Set default output file name if the output file was not specified.
-  if (ctx->outputPath().empty()) {
-    switch (ctx->outputFileType()) {
-    case LinkingContext::OutputFileType::YAML:
-      ctx->setOutputPath("-");
-      break;
-    default:
-      ctx->setOutputPath("a.out");
-      break;
-    }
-  }
-
-  // Validate the combination of options used.
-  if (!ctx->validate(diag))
-    return false;
-
-  // Perform linker script semantic actions
-  if (auto ec = ctx->linkerScriptSema().perform()) {
-    diag << "Error in the linker script's semantics: " << ec.message() << "\n";
-    return false;
-  }
-
-  context.swap(ctx);
-  return true;
-}
-
-/// Get the default target triple based on either the program name
-/// (e.g. "x86-ibm-linux-lld") or the primary target llvm was configured for.
-llvm::Triple GnuLdDriver::getDefaultTarget(const char *progName) {
-  SmallVector<StringRef, 4> components;
-  llvm::SplitString(llvm::sys::path::stem(progName), components, "-");
-  // If has enough parts to be start with a triple.
-  if (components.size() >= 4) {
-    llvm::Triple triple(components[0], components[1], components[2],
-                        components[3]);
-    // If first component looks like an arch.
-    if (triple.getArch() != llvm::Triple::UnknownArch)
-      return triple;
-  }
-
-  // Fallback to use whatever default triple llvm was configured for.
-  return llvm::Triple(llvm::sys::getDefaultTargetTriple());
-}
diff --git a/lib/Driver/GnuLdOptions.td b/lib/Driver/GnuLdOptions.td
deleted file mode 100644
index 7d850d4d002e..000000000000
--- a/lib/Driver/GnuLdOptions.td
+++ /dev/null
@@ -1,378 +0,0 @@
-include "llvm/Option/OptParser.td"
-
-//===----------------------------------------------------------------------===//
-/// Utility Functions
-//===----------------------------------------------------------------------===//
-// Single and multiple dash options combined
-multiclass smDash<string opt1, string opt2, string help> {
-  // Option
-  def "" : Separate<["-"], opt1>, HelpText<help>;
-  def opt1_eq : Joined<["-"], opt1#"=">,
-      Alias<!cast<Option>(opt1)>;
-  // Compatibility aliases
-  def opt2_dashdash : Separate<["--"], opt2>,
-      Alias<!cast<Option>(opt1)>;
-  def opt2_dashdash_eq : Joined<["--"], opt2#"=">,
-      Alias<!cast<Option>(opt1)>;
-}
-
-// Support -<option>,-<option>=
-multiclass dashEq<string opt1, string opt2, string help> {
-  // Option
-  def "" : Separate<["-"], opt1>, HelpText<help>;
-  // Compatibility aliases
-  def opt2_eq : Joined<["-"], opt2#"=">,
-      Alias<!cast<Option>(opt1)>;
-}
-
-// Support --<option>,--<option>=
-multiclass mDashEq<string opt1, string help> {
-  // Option
-  def "" : Separate<["--"], opt1>, HelpText<help>;
-  // Compatibility aliases
-  def opt2_eq : Joined<["--"], opt1#"=">,
-      Alias<!cast<Option>(opt1)>;
-}
-
-//===----------------------------------------------------------------------===//
-/// LLVM and Target options
-//===----------------------------------------------------------------------===//
-def grp_llvmtarget : OptionGroup<"opts">,
-     HelpText<"LLVM and Target Options">;
-def mllvm : Separate<["-"], "mllvm">,
-     HelpText<"Options to pass to LLVM">, Group<grp_llvmtarget>;
-def target : Separate<["-"], "target">, MetaVarName<"<triple>">,
-     HelpText<"Target triple to link for">,
-     Group<grp_llvmtarget>;
-
-//===----------------------------------------------------------------------===//
-/// Output Kinds
-//===----------------------------------------------------------------------===//
-def grp_kind : OptionGroup<"outs">,
-     HelpText<"OUTPUT KIND">;
-def relocatable : Flag<["-"], "r">,
-     HelpText<"Create relocatable object file">, Group<grp_kind>;
-def static : Flag<["-"], "static">,
-     HelpText<"Create static executable">, Group<grp_kind>;
-def dynamic : Flag<["-"], "dynamic">,
-     HelpText<"Create dynamic executable (default)">,Group<grp_kind>;
-def shared : Flag<["-"], "shared">,
-     HelpText<"Create dynamic library">, Group<grp_kind>;
-
-// output kinds - compatibility aliases
-def Bstatic : Flag<["-"], "Bstatic">, Alias<static>;
-def Bshareable : Flag<["-"], "Bshareable">, Alias<shared>;
-
-//===----------------------------------------------------------------------===//
-/// General Options
-//===----------------------------------------------------------------------===//
-def grp_general : OptionGroup<"opts">,
-     HelpText<"GENERAL OPTIONS">;
-def output : Separate<["-"], "o">, MetaVarName<"<path>">,
-     HelpText<"Path to file to write output">,
-     Group<grp_general>;
-def m : JoinedOrSeparate<["-"], "m">, MetaVarName<"<emulation>">,
-     HelpText<"Select target emulation">,
-     Group<grp_general>;
-def build_id : Flag<["--"], "build-id">,
-     HelpText<"Request creation of \".note.gnu.build-id\" ELF note section">,
-     Group<grp_general>;
-def sysroot : Joined<["--"], "sysroot=">,
-    HelpText<"Set the system root">,
-    Group<grp_general>;
-
-
-//===----------------------------------------------------------------------===//
-/// Executable Options
-//===----------------------------------------------------------------------===//
-def grp_main : OptionGroup<"opts">,
-     HelpText<"EXECUTABLE OPTIONS">;
-def L : Joined<["-"], "L">, MetaVarName<"<dir>">,
-     HelpText<"Directory to search for libraries">,
-     Group<grp_main>;
-def l : Joined<["-"], "l">, MetaVarName<"<libName>">,
-     HelpText<"Root name of library to use">,
-     Group<grp_main>;
-def noinhibit_exec : Flag<["--"], "noinhibit-exec">,
-     HelpText<"Retain the executable output file whenever"
-              " it is still usable">,
-     Group<grp_main>;
-defm e : smDash<"e", "entry",
-      "Name of entry point symbol">,
-      Group<grp_main>;
-defm init: dashEq<"init", "init",
-      "Specify an initializer function">,
-      Group<grp_main>;
-defm fini: dashEq<"fini", "fini",
-      "Specify a finalizer function">,
-      Group<grp_main>;
-def whole_archive: Flag<["--"], "whole-archive">,
-     HelpText<"Force load of all members in a static library">,
-     Group<grp_main>;
-def no_whole_archive: Flag<["--"], "no-whole-archive">,
-     HelpText<"Restores the default behavior of loading archive members">,
-     Group<grp_main>;
-def nostdlib : Flag<["-"], "nostdlib">,
-     HelpText<"Disable default search path for libraries">,
-     Group<grp_main>;
-def image_base : Separate<["--"], "image-base">,
-     HelpText<"Set the base address">,
-     Group<grp_main>;
-
-//===----------------------------------------------------------------------===//
-/// Static Executable Options
-//===----------------------------------------------------------------------===//
-def grp_staticexec : OptionGroup<"opts">,
-     HelpText<"STATIC EXECUTABLE OPTIONS">;
-def nmagic : Flag<["--"], "nmagic">,
-     HelpText<"Turn off page alignment of sections,"
-              " and disable linking against shared libraries">,
-     Group<grp_staticexec>;
-def omagic : Flag<["--"], "omagic">,
-     HelpText<"Set the text and data sections to be readable and writable."
-              " Also, do not page-align the data segment, and"
-              " disable linking against shared libraries.">,
-     Group<grp_staticexec>;
-def no_omagic : Flag<["--"], "no-omagic">,
-     HelpText<"This option negates most of the effects of the -N option."
-              "Disable linking with shared libraries">,
-     Group<grp_staticexec>;
-// Compatible Aliases
-def nmagic_alias : Flag<["-"], "n">,
-     Alias<nmagic>;
-def omagic_alias : Flag<["-"], "N">,
-     Alias<omagic>;
-
-//===----------------------------------------------------------------------===//
-/// Dynamic Library/Executable Options
-//===----------------------------------------------------------------------===//
-def grp_dynlibexec : OptionGroup<"opts">,
-     HelpText<"DYNAMIC LIBRARY/EXECUTABLE OPTIONS">;
-def dynamic_linker : Joined<["--"], "dynamic-linker=">,
-    HelpText<"Set the path to the dynamic linker">, Group<grp_dynlibexec>;
-// Executable options - compatibility aliases
-def dynamic_linker_alias : Separate<["-", "--"], "dynamic-linker">,
-    Alias<dynamic_linker>;
-defm rpath : dashEq<"rpath", "rpath",
-     "Add a directory to the runtime library search path">,
-     Group<grp_dynlibexec>;
-def rpath_link : Separate<["-"], "rpath-link">,
-     HelpText<"Specifies the first set of directories to search">,
-     Group<grp_dynlibexec>;
-def export_dynamic : Flag<["-", "--"], "export-dynamic">,
-     HelpText<"Add all symbols to the dynamic symbol table"
-              " when creating executables">,
-     Group<grp_main>;
-def alias_export_dynamic: Flag<["-"], "E">,
-      Alias<export_dynamic>;
-def no_export_dynamic : Flag<["--"], "no-export-dynamic">,
-     Group<grp_main>;
-
-//===----------------------------------------------------------------------===//
-/// Dynamic Library Options
-//===----------------------------------------------------------------------===//
-def grp_dynlib : OptionGroup<"opts">,
-     HelpText<"DYNAMIC LIBRARY OPTIONS">;
-def soname : Joined<["-", "--"], "soname=">,
-     HelpText<"Set the internal DT_SONAME field to the specified name">,
-     Group<grp_dynlib>;
-def soname_separate : Separate<["-", "--"], "soname">, Alias<soname>;
-def soname_h : Separate<["-"], "h">, Alias<soname>;
-
-//===----------------------------------------------------------------------===//
-/// Resolver Options
-//===----------------------------------------------------------------------===//
-def grp_resolveropt : OptionGroup<"opts">,
-     HelpText<"SYMBOL RESOLUTION OPTIONS">;
-defm u : smDash<"u", "undefined",
-      "Force symbol to be entered in the output file"
-      " as an undefined symbol">,
-      Group<grp_resolveropt>;
-def start_group : Flag<["--"], "start-group">,
-     HelpText<"Start a group">,
-     Group<grp_resolveropt>;
-def alias_start_group: Flag<["-"], "(">,
-      Alias<start_group>;
-def end_group : Flag<["--"], "end-group">,
-     HelpText<"End a group">,
-     Group<grp_resolveropt>;
-def alias_end_group: Flag<["-"], ")">,
-      Alias<end_group>;
-def as_needed : Flag<["--"], "as-needed">,
-     HelpText<"This option affects ELF DT_NEEDED tags for "
-              "dynamic libraries mentioned on the command line">,
-     Group<grp_resolveropt>;
-def no_as_needed : Flag<["--"], "no-as-needed">,
-     HelpText<"This option restores the default behavior"
-              " of adding DT_NEEDED entries">,
-     Group<grp_resolveropt>;
-def no_allow_shlib_undefs : Flag<["--"], "no-allow-shlib-undefined">,
-     HelpText<"Do not allow undefined symbols from dynamic"
-              " library when creating executables">,
-     Group<grp_resolveropt>;
-def allow_shlib_undefs : Flag<["-", "--"], "allow-shlib-undefined">,
-     HelpText<"Allow undefined symbols from dynamic"
-             " library when creating executables">,
-     Group<grp_resolveropt>;
-def use_shlib_undefs: Flag<["--"], "use-shlib-undefines">,
-    HelpText<"Resolve undefined symbols from dynamic libraries">,
-    Group<grp_resolveropt>;
-def allow_multiple_definition: Flag<["--"], "allow-multiple-definition">,
-    HelpText<"Allow multiple definitions">,
-    Group<grp_resolveropt>;
-defm defsym : mDashEq<"defsym",
-           "Create a global symbol in the output file "
-           "containing the absolute address given by expression">,
-           MetaVarName<"symbol=<expression>">,
-           Group<grp_resolveropt>;
-
-//===----------------------------------------------------------------------===//
-/// Custom Options
-//===----------------------------------------------------------------------===//
-def grp_customopts : OptionGroup<"opts">,
-     HelpText<"CUSTOM OPTIONS">;
-def disable_newdtags: Flag<["--"], "disable-new-dtags">,
-     HelpText<"Disable new dynamic tags">,
-     Group<grp_customopts>;
-def enable_newdtags: Flag<["--"], "enable-new-dtags">,
-     HelpText<"Enable new dynamic tags">,
-     Group<grp_customopts>;
-def rosegment: Flag<["--"], "rosegment">,
-     HelpText<"Put read-only non-executable sections in their own segment">,
-     Group<grp_customopts>;
-def z : Separate<["-"], "z">,
-     HelpText<"Linker Option extensions">,
-     Group<grp_customopts>;
-def no_align_segments: Flag<["--"], "no-align-segments">,
-     HelpText<"Don't align ELF segments(virtualaddress/fileoffset) to page boundaries">,
-     Group<grp_customopts>;
-
-//===----------------------------------------------------------------------===//
-/// Symbol options
-//===----------------------------------------------------------------------===//
-def grp_symbolopts : OptionGroup<"opts">,
-     HelpText<"SYMBOL OPTIONS">;
-def demangle : Flag<["--"], "demangle">,
-     HelpText<"Demangle C++ symbols">,
-     Group<grp_symbolopts>;
-def discard_loc : Flag<["--"], "discard-all">,
-     HelpText<"Discard all local symbols">,
-     Group<grp_symbolopts>;
-def alias_discard_loc: Flag<["-"], "x">,
-     Alias<discard_loc>;
-def discard_temp_loc : Flag<["--"], "discard-locals">,
-     HelpText<"Discard temporary local symbols">,
-     Group<grp_symbolopts>;
-def alias_discard_temp_loc : Flag<["-"], "X">,
-     Alias<discard_temp_loc>;
-def no_demangle : Flag<["--"], "no-demangle">,
-     HelpText<"Dont demangle C++ symbols">,
-     Group<grp_symbolopts>;
-def strip_all : Flag<["--"], "strip-all">,
-     HelpText<"Omit all symbol informations from output">,
-     Group<grp_symbolopts>;
-def alias_strip_all : Flag<["-"], "s">,
-     Alias<strip_all>;
-defm wrap : smDash<"wrap", "wrap",
-            "Use a wrapper function for symbol. Any "
-            " undefined reference to symbol will be resolved to "
-            "\"__wrap_symbol\". Any undefined reference to \"__real_symbol\""
-            " will be resolved to symbol.">,
-            MetaVarName<"<symbol>">,
-            Group<grp_symbolopts>;
-
-//===----------------------------------------------------------------------===//
-/// Script Options
-//===----------------------------------------------------------------------===//
-def grp_scriptopts : OptionGroup<"opts">,
-     HelpText<"SCRIPT OPTIONS">;
-defm T : smDash<"T", "script",
-      "Use the given linker script in place of the default script.">,
-      Group<grp_scriptopts>;
-
-//===----------------------------------------------------------------------===//
-/// Optimization Options
-//===----------------------------------------------------------------------===//
-def grp_opts : OptionGroup<"opts">,
-     HelpText<"OPTIMIZATIONS">;
-def hash_style : Joined <["--"], "hash-style=">,
-     HelpText<"Set the type of linker's hash table(s)">,
-     Group<grp_opts>;
-def merge_strings : Flag<["--"], "merge-strings">,
-     HelpText<"Merge common strings across mergeable sections">,
-     Group<grp_opts>;
-def eh_frame_hdr : Flag<["--"], "eh-frame-hdr">,
-     HelpText<"Request creation of .eh_frame_hdr section and ELF "
-              " PT_GNU_EH_FRAME segment header">,
-     Group<grp_opts>;
-
-//===----------------------------------------------------------------------===//
-/// Tracing Options
-//===----------------------------------------------------------------------===//
-def grp_tracingopts : OptionGroup<"opts">,
-     HelpText<"TRACING OPTIONS">;
-def t : Flag<["-"], "t">,
-     HelpText<"Print the names of the input files as ld processes them">,
-     Group<grp_tracingopts>;
-def stats : Flag<["--"], "stats">,
-     HelpText<"Print time and memory usage stats">, Group<grp_tracingopts>;
-
-//===----------------------------------------------------------------------===//
-/// Extensions
-//===----------------------------------------------------------------------===//
-def grp_extns : OptionGroup<"opts">,
-     HelpText<"Extensions">;
-def output_filetype: Separate<["--"], "output-filetype">,
-      HelpText<"Specify yaml to create an output in YAML format">,
-      Group<grp_extns>;
-def alias_output_filetype: Joined<["--"], "output-filetype=">,
-      Alias<output_filetype>;
-
-//===----------------------------------------------------------------------===//
-/// Target Specific Options
-//===----------------------------------------------------------------------===//
-def grp_targetopts : OptionGroup<"opts">,
-     HelpText<"ARCH SPECIFIC OPTIONS">;
-
-//===----------------------------------------------------------------------===//
-/// ARM Target Specific Options
-//===----------------------------------------------------------------------===//
-def grp_arm_targetopts : OptionGroup<"ARM SPECIFIC OPTIONS">,
-     Group<grp_targetopts>;
-def target1_rel : Flag<["--"], "target1-rel">,
-     Group<grp_arm_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_REL32">;
-def target1_abs : Flag<["--"], "target1-abs">,
-     Group<grp_arm_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_ABS32">;
-
-//===----------------------------------------------------------------------===//
-/// MIPS Target Specific Options
-//===----------------------------------------------------------------------===//
-def grp_mips_targetopts : OptionGroup<"MIPS SPECIFIC OPTIONS">,
-     Group<grp_targetopts>;
-def pcrel_eh_reloc : Flag<["-", "--"], "pcrel-eh-reloc">,
-     Group<grp_mips_targetopts>,
-     HelpText<"Interpret R_MIPS_EH as R_MIPS_PC32">;
-
-//===----------------------------------------------------------------------===//
-/// Ignored options
-//===----------------------------------------------------------------------===//
-def grp_ignored: OptionGroup<"ignored">,
-     HelpText<"GNU Options ignored for Compatibility ">;
-def dashg : Flag<["-"], "g">,
-     HelpText<"Ignored.">,
-     Group<grp_ignored>;
-def Qy : Flag<["-"], "Qy">,
-     HelpText<"Ignored for SVR4 Compatibility">,
-     Group<grp_ignored>;
-def qmagic : Flag<["-"], "qmagic">,
-     HelpText<"Ignored for Linux Compatibility">,
-     Group<grp_ignored>;
-def G : Separate<["-"], "G">,
-     HelpText<"Ignored for MIPS GNU Linker Compatibility">,
-     Group<grp_ignored>;
-
-//===----------------------------------------------------------------------===//
-/// Help
-//===----------------------------------------------------------------------===//
-def help : Flag<["--"], "help">,
-     HelpText<"Display this help message">;
diff --git a/lib/Driver/TODO.rst b/lib/Driver/TODO.rst
deleted file mode 100644
index 868eaf02290c..000000000000
--- a/lib/Driver/TODO.rst
+++ /dev/null
@@ -1,99 +0,0 @@
-GNU ld Driver
-~~~~~~~~~~~~~
-
-Missing Options
-###############
-
-* --audit
-* -A,--architecture
-* -b,--format
-* -d,-dc,-dp
-* -P,--depaudit
-* --exclude-libs
-* --exclude-modules-for-implib
-* -E,--export-dynamic,--no-export-dynamic
-* -EB (We probably shouldn't support this)
-* -EL (We probably shouldn't support this)
-* -f,--auxiliary
-* -F,--filter
-* -G,--gpsize
-* -h
-* -i
-* --library
-* -M
-* --print-map
-* -output
-* -O
-* -q,--emit-relocs
-* --force-dynamic
-* --relocatable
-* -R,--just-symbols
-* -s,--strip-all
-* -S,--strip-debug
-* --trace
-* -dT,--default-script
-* -Ur
-* --unique
-* -v,--version,-V
-* -y,--trace-symbol
-* -z (keywords need to be implemented)
-* --accept-unknown-input-arch,--no-accept-unknown-input-arch
-* -Bdynamic,-dy,-call_shared
-* -Bgroup
-* -dn,-non_shared
-* -Bsymbolic
-* -Bsymbolic-functions
-* --dynamic-list
-* --dynamic-list-data
-* --dynamic-list-cpp-new
-* --dynamic-list-cpp-typeinfo
-* --check-sections,--no-check-sections
-* --copy-dt-needed-entries,--no-copy-dt-needed-entires
-* --cref
-* --no-define-common
-* --defsym (only absolute value supported now)
-* --demangle,--no-demangle
-* -I
-* --fatal-warnings,--no-fatal-warnings
-* --force-exe-suffix
-* --gc-sections,--no-gc-sections
-* --print-gc-sections,--no-print-gc-sections
-* --print-output-format
-* --target-help
-* -Map
-* --no-keep-memory
-* --no-undefined,-z defs
-* --allow-shlib-undefined,--no-alow-shlib-undefined
-* --no-undefined-version
-* --default-symver
-* --default-imported-symver
-* --no-warn-mismatch
-* --no-warn-search-mismatch
-* --oformat
-* -pie,--pic-executable
-* --relax,--no-relax
-* --retain-symbols-file
-* --sort-common
-* --sort-section={name,alignment}
-* --split-by-file
-* --split-by-reloc
-* --stats
-* --section-start
-* -T{bss,data,text,{text,rodata,data}-segment}
-* --unresolved-symbols
-* -dll-verbose,--verbose
-* --version-script
-* --warn-common
-* --warn-constructors
-* --warn-multiple-gp
-* --warn-once
-* --warn-section-align
-* --warn-shared-textrel
-* --warn-alternate-em
-* --warn-unresolved-symbols
-* --error-unresolved-symbols
-* --wrap
-* --no-ld-generated-unwind-info
-* --hash-size
-* --reduce-memory-overheads
-* --build-id
diff --git a/lib/Driver/UniversalDriver.cpp b/lib/Driver/UniversalDriver.cpp
deleted file mode 100644
index 3dea7ebfae89..000000000000
--- a/lib/Driver/UniversalDriver.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-//===- lib/Driver/UniversalDriver.cpp -------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-///
-/// Driver for "universal" lld tool which can mimic any linker command line
-/// parsing once it figures out which command line flavor to use.
-///
-//===----------------------------------------------------------------------===//
-
-#include "lld/Driver/Driver.h"
-#include "lld/Config/Version.h"
-#include "lld/Core/LLVM.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Option/Option.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace lld;
-
-namespace {
-
-// Create enum with OPT_xxx values for each option in GnuLdOptions.td
-enum {
-  OPT_INVALID = 0,
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELP, META)                                                     \
-  OPT_##ID,
-#include "UniversalDriverOptions.inc"
-#undef OPTION
-};
-
-// Create prefix string literals used in GnuLdOptions.td
-#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
-#include "UniversalDriverOptions.inc"
-#undef PREFIX
-
-// Create table mapping all options defined in GnuLdOptions.td
-static const llvm::opt::OptTable::Info infoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR)                                              \
-  {                                                                            \
-    PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, llvm::opt::Option::KIND##Class, \
-        PARAM, FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS                      \
-  }                                                                            \
-  ,
-#include "UniversalDriverOptions.inc"
-#undef OPTION
-};
-
-// Create OptTable class for parsing actual command line arguments
-class UniversalDriverOptTable : public llvm::opt::OptTable {
-public:
-  UniversalDriverOptTable()
-      : OptTable(infoTable) {}
-};
-
-enum class Flavor {
-  invalid,
-  old_gnu_ld, // -flavor old-gnu
-  gnu_ld,     // -flavor gnu
-  win_link,   // -flavor link
-  darwin_ld,  // -flavor darwin
-  core        // -flavor core OR -core
-};
-
-struct ProgramNameParts {
-  StringRef _target;
-  StringRef _flavor;
-};
-
-} // anonymous namespace
-
-static Flavor strToFlavor(StringRef str) {
-  return llvm::StringSwitch<Flavor>(str)
-      .Case("old-gnu", Flavor::old_gnu_ld)
-      .Case("gnu", Flavor::gnu_ld)
-      .Case("ld.lld", Flavor::gnu_ld)
-      .Case("link", Flavor::win_link)
-      .Case("lld-link", Flavor::win_link)
-      .Case("darwin", Flavor::darwin_ld)
-      .Case("core", Flavor::core)
-      .Case("ld", Flavor::gnu_ld)
-      .Default(Flavor::invalid);
-}
-
-static ProgramNameParts parseProgramName(StringRef programName) {
-  SmallVector<StringRef, 3> components;
-  llvm::SplitString(programName, components, "-");
-  ProgramNameParts ret;
-
-  using std::begin;
-  using std::end;
-
-  // Erase any lld components.
-  components.erase(std::remove(components.begin(), components.end(), "lld"),
-                   components.end());
-
-  // Find the flavor component.
-  auto flIter = std::find_if(components.begin(), components.end(),
-                             [](StringRef str) -> bool {
-    return strToFlavor(str) != Flavor::invalid;
-  });
-
-  if (flIter != components.end()) {
-    ret._flavor = *flIter;
-    components.erase(flIter);
-  }
-
-  // Any remaining component must be the target.
-  if (components.size() == 1)
-    ret._target = components[0];
-
-  return ret;
-}
-
-// Removes the argument from argv along with its value, if exists, and updates
-// argc.
-static void removeArg(llvm::opt::Arg *arg,
-                      llvm::MutableArrayRef<const char *> &args) {
-  unsigned int numToRemove = arg->getNumValues() + 1;
-  auto sub = args.slice(arg->getIndex() + 1);
-  std::rotate(sub.begin(), sub.begin() + numToRemove, sub.end());
-  args = args.drop_back(numToRemove);
-}
-
-static Flavor getFlavor(llvm::MutableArrayRef<const char *> &args,
-                        const llvm::opt::InputArgList &parsedArgs) {
-  if (llvm::opt::Arg *argCore = parsedArgs.getLastArg(OPT_core)) {
-    removeArg(argCore, args);
-    return Flavor::core;
-  }
-  if (llvm::opt::Arg *argFlavor = parsedArgs.getLastArg(OPT_flavor)) {
-    removeArg(argFlavor, args);
-    return strToFlavor(argFlavor->getValue());
-  }
-
-#if LLVM_ON_UNIX
-  if (llvm::sys::path::filename(args[0]).equals("ld")) {
-#if __APPLE__
-    // On a Darwin systems, if linker binary is named "ld", use Darwin driver.
-    return Flavor::darwin_ld;
-#endif
-    // On a ELF based systems, if linker binary is named "ld", use gnu driver.
-    return Flavor::gnu_ld;
-  }
-#endif
-
-  StringRef name = llvm::sys::path::filename(args[0]);
-  if (name.endswith_lower(".exe"))
-    name = llvm::sys::path::stem(name);
-  return strToFlavor(parseProgramName(name)._flavor);
-}
-
-namespace lld {
-
-bool UniversalDriver::link(llvm::MutableArrayRef<const char *> args,
-                           raw_ostream &diagnostics) {
-  // Parse command line options using GnuLdOptions.td
-  UniversalDriverOptTable table;
-  unsigned missingIndex;
-  unsigned missingCount;
-
-  // Program name
-  StringRef programName = llvm::sys::path::stem(args[0]);
-
-  llvm::opt::InputArgList parsedArgs =
-      table.ParseArgs(args.slice(1), missingIndex, missingCount);
-
-  if (missingCount) {
-    diagnostics << "error: missing arg value for '"
-                << parsedArgs.getArgString(missingIndex) << "' expected "
-                << missingCount << " argument(s).\n";
-    return false;
-  }
-
-  // Handle -help
-  if (parsedArgs.getLastArg(OPT_help)) {
-    table.PrintHelp(llvm::outs(), programName.data(), "LLVM Linker", false);
-    return true;
-  }
-
-  // Handle -version
-  if (parsedArgs.getLastArg(OPT_version)) {
-    diagnostics << "LLVM Linker Version: " << getLLDVersion()
-                << getLLDRepositoryVersion() << "\n";
-    return true;
-  }
-
-  Flavor flavor = getFlavor(args, parsedArgs);
-
-  // Switch to appropriate driver.
-  switch (flavor) {
-  case Flavor::old_gnu_ld:
-    return GnuLdDriver::linkELF(args, diagnostics);
-  case Flavor::gnu_ld:
-    elf2::link(args);
-    return true;
-  case Flavor::darwin_ld:
-    return DarwinLdDriver::linkMachO(args, diagnostics);
-  case Flavor::win_link:
-    coff::link(args);
-    return true;
-  case Flavor::core:
-    return CoreDriver::link(args, diagnostics);
-  case Flavor::invalid:
-    diagnostics << "Select the appropriate flavor\n";
-    table.PrintHelp(llvm::outs(), programName.data(), "LLVM Linker", false);
-    return false;
-  }
-  llvm_unreachable("Unrecognised flavor");
-}
-
-} // end namespace lld
diff --git a/lib/Driver/UniversalDriverOptions.td b/lib/Driver/UniversalDriverOptions.td
deleted file mode 100644
index 14abc9ce9911..000000000000
--- a/lib/Driver/UniversalDriverOptions.td
+++ /dev/null
@@ -1,19 +0,0 @@
-include "llvm/Option/OptParser.td"
-
-// Select an optional flavor
-def flavor: Separate<["-"], "flavor">,
-     HelpText<"Flavor for linking, options are gnu/darwin/link">;
-
-// Select the core flavor
-def core : Flag<["-"], "core">,
-     HelpText<"CORE linking">;
-
-def target: Separate<["-"], "target">,
-     HelpText<"Select the target">;
-
-def version: Flag<["-"], "version">,
-     HelpText<"Display the version">;
-
-// Help message
-def help : Flag<["-"], "help">,
-     HelpText<"Display this help message">;
diff --git a/lib/ReaderWriter/CMakeLists.txt b/lib/ReaderWriter/CMakeLists.txt
index 2bb5655b9e35..4408d9c18b8b 100644
--- a/lib/ReaderWriter/CMakeLists.txt
+++ b/lib/ReaderWriter/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(ELF)
 add_subdirectory(MachO)
 add_subdirectory(YAML)
 
@@ -7,9 +6,7 @@ if (MSVC)
 endif()
 
 add_lld_library(lldReaderWriter
-  CoreLinkingContext.cpp
   FileArchive.cpp
-  LinkerScript.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/ReaderWriter
diff --git a/lib/ReaderWriter/CoreLinkingContext.cpp b/lib/ReaderWriter/CoreLinkingContext.cpp
deleted file mode 100644
index 02f6263c0c3f..000000000000
--- a/lib/ReaderWriter/CoreLinkingContext.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//===- lib/ReaderWriter/CoreLinkingContext.cpp ----------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lld/Core/DefinedAtom.h"
-#include "lld/Core/File.h"
-#include "lld/Core/Pass.h"
-#include "lld/Core/PassManager.h"
-#include "lld/Core/Simple.h"
-#include "lld/ReaderWriter/CoreLinkingContext.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
-
-using namespace lld;
-
-namespace {
-
-class OrderPass : public Pass {
-public:
-  /// Sorts atoms by position
-  std::error_code perform(SimpleFile &file) override {
-    SimpleFile::DefinedAtomRange defined = file.definedAtoms();
-    std::sort(defined.begin(), defined.end(), DefinedAtom::compareByPosition);
-    return std::error_code();
-  }
-};
-
-} // anonymous namespace
-
-CoreLinkingContext::CoreLinkingContext() {}
-
-bool CoreLinkingContext::validateImpl(raw_ostream &) {
-  _writer = createWriterYAML(*this);
-  return true;
-}
-
-void CoreLinkingContext::addPasses(PassManager &pm) {
-  for (StringRef name : _passNames) {
-    (void)name;
-    assert(name == "order" && "bad pass name");
-    pm.add(llvm::make_unique<OrderPass>());
-  }
-}
-
-Writer &CoreLinkingContext::writer() const { return *_writer; }
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h b/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
deleted file mode 100644
index 73864d2b4c38..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h ---------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef AARCH64_DYNAMIC_LIBRARY_WRITER_H
-#define AARCH64_DYNAMIC_LIBRARY_WRITER_H
-
-#include "AArch64LinkingContext.h"
-#include "AArch64TargetHandler.h"
-#include "DynamicLibraryWriter.h"
-
-namespace lld {
-namespace elf {
-
-class AArch64DynamicLibraryWriter : public DynamicLibraryWriter<ELF64LE> {
-public:
-  AArch64DynamicLibraryWriter(AArch64LinkingContext &ctx,
-                              TargetLayout<ELF64LE> &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-};
-
-AArch64DynamicLibraryWriter::AArch64DynamicLibraryWriter(
-    AArch64LinkingContext &ctx, TargetLayout<ELF64LE> &layout)
-    : DynamicLibraryWriter(ctx, layout) {}
-
-void AArch64DynamicLibraryWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  DynamicLibraryWriter::createImplicitFiles(result);
-  auto gotFile = llvm::make_unique<SimpleFile>("GOTFile");
-  gotFile->addAtom(*new (gotFile->allocator()) GlobalOffsetTableAtom(*gotFile));
-  gotFile->addAtom(*new (gotFile->allocator()) DynamicAtom(*gotFile));
-  result.push_back(std::move(gotFile));
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.cpp
deleted file mode 100644
index 9a9ec6cba12b..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AArch64LinkingContext.h"
-#include "AArch64ExecutableWriter.h"
-#include "AArch64TargetHandler.h"
-#include "AArch64SectionChunks.h"
-
-namespace lld {
-namespace elf {
-
-AArch64ExecutableWriter::AArch64ExecutableWriter(AArch64LinkingContext &ctx,
-                                                 AArch64TargetLayout &layout)
-  : ExecutableWriter(ctx, layout), _targetLayout(layout) {}
-
-void AArch64ExecutableWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  ExecutableWriter::createImplicitFiles(result);
-  auto gotFile = llvm::make_unique<SimpleFile>("GOTFile");
-  gotFile->addAtom(*new (gotFile->allocator()) GlobalOffsetTableAtom(*gotFile));
-  if (this->_ctx.isDynamic())
-    gotFile->addAtom(*new (gotFile->allocator()) DynamicAtom(*gotFile));
-  result.push_back(std::move(gotFile));
-}
-
-void AArch64ExecutableWriter::buildDynamicSymbolTable(const File &file) {
-  for (auto sec : this->_layout.sections()) {
-    if (auto section = dyn_cast<AtomSection<ELF64LE>>(sec)) {
-      for (const auto &atom : section->atoms()) {
-        // Add all globals GOT symbols (in both .got and .got.plt sections)
-        // on dynamic symbol table.
-        for (const auto &section : _targetLayout.getGOTSections()) {
-          if (section->hasGlobalGOTEntry(atom->_atom))
-            _dynamicSymbolTable->addSymbol(atom->_atom, section->ordinal(),
-                                           atom->_virtualAddr, atom);
-        }
-      }
-    }
-  }
-
-  ExecutableWriter<ELF64LE>::buildDynamicSymbolTable(file);
-}
-
-} // namespace elf
-} // namespace lld
-
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h b/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
deleted file mode 100644
index eef825040ffa..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef AARCH64_EXECUTABLE_WRITER_H
-#define AARCH64_EXECUTABLE_WRITER_H
-
-#include "ExecutableWriter.h"
-
-namespace lld {
-namespace elf {
-
-class AArch64TargetLayout;
-class AArch64LinkingContext;
-
-class AArch64ExecutableWriter : public ExecutableWriter<ELF64LE> {
-public:
-  AArch64ExecutableWriter(AArch64LinkingContext &ctx,
-                          AArch64TargetLayout &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void buildDynamicSymbolTable(const File &file) override;
-
-private:
-  AArch64TargetLayout &_targetLayout;
-};
-
-} // namespace elf
-} // namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp
deleted file mode 100644
index ba883f7f59db..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AArch64LinkingContext.h"
-#include "AArch64RelocationPass.h"
-#include "AArch64TargetHandler.h"
-
-using namespace lld;
-using namespace lld::elf;
-
-std::unique_ptr<ELFLinkingContext>
-elf::createAArch64LinkingContext(llvm::Triple triple) {
-  if (triple.getArch() == llvm::Triple::aarch64)
-    return llvm::make_unique<AArch64LinkingContext>(triple);
-  return nullptr;
-}
-
-AArch64LinkingContext::AArch64LinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(triple, std::unique_ptr<TargetHandler>(
-                                    new AArch64TargetHandler(*this))) {}
-
-void AArch64LinkingContext::addPasses(PassManager &pm) {
-  auto pass = createAArch64RelocationPass(*this);
-  if (pass)
-    pm.add(std::move(pass));
-  ELFLinkingContext::addPasses(pm);
-}
-
-static const Registry::KindStrings kindStrings[] = {
-#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
-#include "llvm/Support/ELFRelocs/AArch64.def"
-#undef ELF_RELOC
-  LLD_KIND_STRING_END
-};
-
-void AArch64LinkingContext::registerRelocationNames(Registry &registry) {
-  registry.addKindTable(Reference::KindNamespace::ELF,
-                        Reference::KindArch::AArch64, kindStrings);
-}
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.h b/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.h
deleted file mode 100644
index 25a173158318..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.h ---------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_LINKING_CONTEXT_H
-#define LLD_READER_WRITER_ELF_AARCH64_AARCH64_LINKING_CONTEXT_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/ELF.h"
-
-namespace lld {
-namespace elf {
-
-enum {
-  /// \brief The offset to add operation for a R_AARCH64_ADR_GOT_PAGE
-  ADD_AARCH64_GOTRELINDEX = 0xE000,
-};
-
-class AArch64LinkingContext final : public ELFLinkingContext {
-public:
-  int getMachineType() const override { return llvm::ELF::EM_AARCH64; }
-  AArch64LinkingContext(llvm::Triple);
-
-  void addPasses(PassManager &) override;
-  void registerRelocationNames(Registry &r) override;
-
-  uint64_t getBaseAddress() const override {
-    if (_baseAddress == 0)
-      return 0x400000;
-    return _baseAddress;
-  }
-
-  bool isDynamicRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::AArch64);
-    switch (r.kindValue()) {
-    case llvm::ELF::R_AARCH64_COPY:
-    case llvm::ELF::R_AARCH64_GLOB_DAT:
-    case llvm::ELF::R_AARCH64_RELATIVE:
-    case llvm::ELF::R_AARCH64_TLS_DTPREL64:
-    case llvm::ELF::R_AARCH64_TLS_DTPMOD64:
-    case llvm::ELF::R_AARCH64_TLS_TPREL64:
-    case llvm::ELF::R_AARCH64_TLSDESC:
-    case llvm::ELF::R_AARCH64_IRELATIVE:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  bool isCopyRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::AArch64);
-    if (r.kindValue() == llvm::ELF::R_AARCH64_COPY)
-      return true;
-    return false;
-  }
-
-  bool isPLTRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::AArch64);
-    switch (r.kindValue()) {
-    case llvm::ELF::R_AARCH64_JUMP_SLOT:
-    case llvm::ELF::R_AARCH64_IRELATIVE:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  bool isRelativeReloc(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::AArch64);
-    switch (r.kindValue()) {
-    case llvm::ELF::R_AARCH64_IRELATIVE:
-    case llvm::ELF::R_AARCH64_RELATIVE:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  /// \brief The path to the dynamic interpreter
-  StringRef getDefaultInterpreter() const override {
-    return "/lib/ld-linux-aarch64.so.1";
-  }
-};
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
deleted file mode 100644
index ac7c769ec26d..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
+++ /dev/null
@@ -1,556 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp ----------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AArch64TargetHandler.h"
-#include "AArch64LinkingContext.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/MathExtras.h"
-
-#define DEBUG_TYPE "AArch64"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm;
-using namespace llvm::support::endian;
-
-static int64_t page(int64_t v) { return v & ~int64_t(0xFFF); }
-
-/// \brief Check X is in the interval (-2^(bits-1), 2^bits]
-static bool withinSignedUnsignedRange(int64_t X, int bits) {
-  return isIntN(bits - 1, X) || isUIntN(bits, X);
-}
-
-/// \brief R_AARCH64_ABS64 - word64: S + A
-static void relocR_AARCH64_ABS64(uint8_t *location, uint64_t P, uint64_t S,
-                                 int64_t A) {
-  int64_t result = (int64_t)S + A;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write64le(location, result | read64le(location));
-}
-
-/// \brief R_AARCH64_ABS32 - word32:  S + A
-static std::error_code relocR_AARCH64_ABS32(uint8_t *location, uint64_t P,
-                                            uint64_t S, int64_t A) {
-  int64_t result = S + A;
-  if (!withinSignedUnsignedRange(result, 32))
-    return make_out_of_range_reloc_error();
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_ABS16 - word16:  S + A
-static std::error_code relocR_AARCH64_ABS16(uint8_t *location, uint64_t P,
-                                            uint64_t S, int64_t A) {
-  int64_t result = S + A;
-  if (!withinSignedUnsignedRange(result, 16))
-    return make_out_of_range_reloc_error();
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write16le(location, result | read16le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_PREL64 - word64: S + A - P
-static void relocR_AARCH64_PREL64(uint8_t *location, uint64_t P,
-                                  uint64_t S, int64_t A) {
-  int64_t result = S + A - P;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write64le(location, result + read64le(location));
-}
-
-/// \brief R_AARCH64_PREL32 - word32: S + A - P
-static std::error_code relocR_AARCH64_PREL32(uint8_t *location, uint64_t P,
-                                             uint64_t S, int64_t A) {
-  int64_t result = S + A - P;
-  // ELF for the ARM 64-bit architecture manual states the overflow
-  // for R_AARCH64_PREL32 to be -2^(-31) <= X < 2^32
-  if (!withinSignedUnsignedRange(result, 32))
-    return make_out_of_range_reloc_error();
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write32le(location, result + read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_PREL16 - word16: S + A - P
-static std::error_code relocR_AARCH64_PREL16(uint8_t *location, uint64_t P,
-                                             uint64_t S, int64_t A) {
-  int64_t result = S + A - P;
-  if (!withinSignedUnsignedRange(result, 16))
-    return make_out_of_range_reloc_error();
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  write16le(location, result + read16le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_ADR_PREL_PG_HI21 - Page(S+A) - Page(P)
-static std::error_code relocR_AARCH64_ADR_PREL_PG_HI21(uint8_t *location,
-                                                       uint64_t P, uint64_t S,
-                                                       int64_t A) {
-  int64_t result = page(S + A) - page(P);
-  if (!isInt<32>(result))
-    return make_out_of_range_reloc_error();
-  result = result >> 12;
-  uint32_t immlo = result & 0x3;
-  uint32_t immhi = result & 0x1FFFFC;
-  immlo = immlo << 29;
-  immhi = immhi << 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);
-        llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, immlo | immhi | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_ADR_PREL_LO21 - S + A - P
-static std::error_code relocR_AARCH64_ADR_PREL_LO21(uint8_t *location, uint64_t P,
-                                                    uint64_t S, int64_t A) {
-  uint64_t result = S + A - P;
-  if (!isInt<20>(result))
-    return make_out_of_range_reloc_error();
-  uint32_t immlo = result & 0x3;
-  uint32_t immhi = result & 0x1FFFFC;
-  immlo = immlo << 29;
-  immhi = immhi << 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);
-        llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, immlo | immhi | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_ADD_ABS_LO12_NC
-static void relocR_AARCH64_ADD_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A) {
-  int32_t result = (int32_t)((S + A) & 0xFFF);
-  result <<= 10;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_CALL26 and R_AARCH64_JUMP26
-static std::error_code relocJump26(uint8_t *location, uint64_t P, uint64_t S,
-                                   int64_t A) {
-  int64_t result = S + A - P;
-  if (!isInt<27>(result))
-    return make_out_of_range_reloc_error();
-  result &= 0x0FFFFFFC;
-  result >>= 2;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_CONDBR19
-static std::error_code relocR_AARCH64_CONDBR19(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  int64_t result = S + A - P;
-  if (!isInt<20>(result))
-    return make_out_of_range_reloc_error();
-  result &= 0x01FFFFC;
-  result <<= 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_LDST8_ABS_LO12_NC - S + A
-static void relocR_AARCH64_LDST8_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                             uint64_t S, int64_t A) {
-  int32_t result = (int32_t)((S + A) & 0xFFF);
-  result <<= 10;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_LDST16_ABS_LO12_NC
-static void relocR_AARCH64_LDST16_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                              uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A);
-  result &= 0x0FFC;
-  result <<= 9;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_LDST32_ABS_LO12_NC
-static void relocR_AARCH64_LDST32_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                              uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A);
-  result &= 0x0FFC;
-  result <<= 8;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_LDST64_ABS_LO12_NC
-static void relocR_AARCH64_LDST64_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                              uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A);
-  result &= 0x0FF8;
-  result <<= 7;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_LDST128_ABS_LO12_NC
-static void relocR_AARCH64_LDST128_ABS_LO12_NC(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A);
-  result &= 0x0FF8;
-  result <<= 6;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-static std::error_code relocR_AARCH64_ADR_GOT_PAGE(uint8_t *location,
-                                                   uint64_t P, uint64_t S,
-                                                   int64_t A) {
-  uint64_t result = page(S + A) - page(P);
-  if (!isInt<32>(result))
-    return make_out_of_range_reloc_error();
-  result = (result >> 12) & 0x3FFFF;
-  uint32_t immlo = result & 0x3;
-  uint32_t immhi = result & 0x1FFFFC;
-  immlo = immlo << 29;
-  immhi = immhi << 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);
-        llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, immlo | immhi | read32le(location));
-  return std::error_code();
-}
-
-// R_AARCH64_LD64_GOT_LO12_NC
-static std::error_code relocR_AARCH64_LD64_GOT_LO12_NC(uint8_t *location,
-                                                       uint64_t P, uint64_t S,
-                                                       int64_t A) {
-  int32_t result = S + A;
-  DEBUG(llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  if ((result & 0x7) != 0)
-    return make_unaligned_range_reloc_error();
-  result &= 0xFF8;
-  result <<= 7;
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-// ADD_AARCH64_GOTRELINDEX
-static void relocADD_AARCH64_GOTRELINDEX(uint8_t *location, uint64_t P,
-                                         uint64_t S, int64_t A) {
-  int32_t result = S + A;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  result &= 0xFFF;
-  result <<= 10;
-  write32le(location, result | read32le(location));
-}
-
-// R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21
-static std::error_code relocR_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21(uint8_t *location,
-                                                                uint64_t P,
-                                                                uint64_t S,
-                                                                int64_t A) {
-  int64_t result = page(S + A) - page(P);
-  if (!isInt<32>(result))
-    return make_out_of_range_reloc_error();
-  result >>= 12;
-  uint32_t immlo = result & 0x3;
-  uint32_t immhi = result & 0x1FFFFC;
-  immlo = immlo << 29;
-  immhi = immhi << 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);
-        llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, immlo | immhi | read32le(location));
-  return std::error_code();
-}
-
-// R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC
-static void relocR_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC(uint8_t *location,
-                                                       uint64_t P, uint64_t S,
-                                                       int64_t A) {
-  int32_t result = S + A;
-  result &= 0xFF8;
-  result <<= 7;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_TLSLE_ADD_TPREL_HI12
-static std::error_code relocR_AARCH64_TLSLE_ADD_TPREL_HI12(uint8_t *location,
-                                                           uint64_t P,
-                                                           uint64_t S,
-                                                           int64_t A) {
-  int64_t result = S + A;
-  if (!isUInt<24>(result))
-    return make_out_of_range_reloc_error();
-  result &= 0x0FFF000;
-  result >>= 2;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_TLSLE_ADD_TPREL_LO12_NC
-static void relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(uint8_t *location,
-                                                   uint64_t P, uint64_t S,
-                                                   int64_t A) {
-  int32_t result = S + A;
-  result &= 0x0FFF;
-  result <<= 10;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-/// \brief R_AARCH64_TLSDESC_ADR_PAGE21 - Page(G(GTLSDESC(S+A))) - Page(P)
-static std::error_code relocR_AARCH64_TLSDESC_ADR_PAGE21(uint8_t *location,
-                                                         uint64_t P, uint64_t S,
-                                                         int64_t A) {
-  int64_t result = page(S + A) - page(P);
-  if (!isInt<32>(result))
-    return make_out_of_range_reloc_error();
-  result = result >> 12;
-  uint32_t immlo = result & 0x3;
-  uint32_t immhi = result & 0x1FFFFC;
-  immlo = immlo << 29;
-  immhi = immhi << 3;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);
-        llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, immlo | immhi | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_TLSDESC_LD64_LO12_NC - G(GTLSDESC(S+A)) -> S + A
-static std::error_code relocR_AARCH64_TLSDESC_LD64_LO12_NC(uint8_t *location,
-                                                           uint64_t P,
-                                                           uint64_t S,
-                                                           int64_t A) {
-  int32_t result = S + A;
-  DEBUG(llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  if ((result & 0x7) != 0)
-    return make_unaligned_range_reloc_error();
-  result &= 0xFF8;
-  result <<= 7;
-  write32le(location, result | read32le(location));
-  return std::error_code();
-}
-
-/// \brief R_AARCH64_TLSDESC_ADD_LO12_NC - G(GTLSDESC(S+A)) -> S + A
-static void relocR_AARCH64_TLSDESC_ADD_LO12_NC(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  int32_t result = (int32_t)((S + A) & 0xFFF);
-  result <<= 10;
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: " << Twine::utohexstr(S);
-        llvm::dbgs() << " A: " << Twine::utohexstr(A);
-        llvm::dbgs() << " P: " << Twine::utohexstr(P);
-        llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
-  write32le(location, result | read32le(location));
-}
-
-std::error_code AArch64TargetRelocationHandler::applyRelocation(
-    ELFWriter &writer, llvm::FileOutputBuffer &buf, const AtomLayout &atom,
-    const Reference &ref) const {
-  uint8_t *atomContent = buf.getBufferStart() + atom._fileOffset;
-  uint8_t *loc = atomContent + ref.offsetInAtom();
-  uint64_t target = writer.addressOfAtom(ref.target());
-  uint64_t reloc = atom._virtualAddr + ref.offsetInAtom();
-  int64_t addend = ref.addend();
-
-  if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-    return std::error_code();
-  assert(ref.kindArch() == Reference::KindArch::AArch64);
-  switch (ref.kindValue()) {
-  case R_AARCH64_NONE:
-    break;
-  case R_AARCH64_ABS64:
-    relocR_AARCH64_ABS64(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_ABS32:
-    return relocR_AARCH64_ABS32(loc, reloc, target, addend);
-  case R_AARCH64_ABS16:
-    return relocR_AARCH64_ABS16(loc, reloc, target, addend);
-  case R_AARCH64_PREL64:
-    relocR_AARCH64_PREL64(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_PREL32:
-    return relocR_AARCH64_PREL32(loc, reloc, target, addend);
-  case R_AARCH64_PREL16:
-    return relocR_AARCH64_PREL16(loc, reloc, target, addend);
-  case R_AARCH64_ADR_PREL_PG_HI21:
-    return relocR_AARCH64_ADR_PREL_PG_HI21(loc, reloc, target, addend);
-  case R_AARCH64_ADR_PREL_LO21:
-    return relocR_AARCH64_ADR_PREL_LO21(loc, reloc, target, addend);
-  case R_AARCH64_ADD_ABS_LO12_NC:
-    relocR_AARCH64_ADD_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_CALL26:
-  case R_AARCH64_JUMP26:
-    return relocJump26(loc, reloc, target, addend);
-  case R_AARCH64_CONDBR19:
-    return relocR_AARCH64_CONDBR19(loc, reloc, target, addend);
-  case R_AARCH64_ADR_GOT_PAGE:
-    return relocR_AARCH64_ADR_GOT_PAGE(loc, reloc, target, addend);
-  case R_AARCH64_LD64_GOT_LO12_NC:
-    return relocR_AARCH64_LD64_GOT_LO12_NC(loc, reloc, target, addend);
-  case R_AARCH64_LDST8_ABS_LO12_NC:
-    relocR_AARCH64_LDST8_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_LDST16_ABS_LO12_NC:
-    relocR_AARCH64_LDST16_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_LDST32_ABS_LO12_NC:
-    relocR_AARCH64_LDST32_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_LDST64_ABS_LO12_NC:
-    relocR_AARCH64_LDST64_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_LDST128_ABS_LO12_NC:
-    relocR_AARCH64_LDST128_ABS_LO12_NC(loc, reloc, target, addend);
-    break;
-  case ADD_AARCH64_GOTRELINDEX:
-    relocADD_AARCH64_GOTRELINDEX(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
-    return relocR_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21(loc, reloc, target, addend);
-  case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
-    relocR_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_TLSLE_ADD_TPREL_HI12:
-  case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC: {
-    auto tpoffset = _layout.getTPOffset();
-    if (ref.kindValue() == R_AARCH64_TLSLE_ADD_TPREL_HI12)
-      return relocR_AARCH64_TLSLE_ADD_TPREL_HI12(loc, reloc, target + tpoffset,
-                                                 addend);
-    else 
-      relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(loc, reloc, target + tpoffset,
-                                             addend);
-  }  break;
-  case R_AARCH64_TLSDESC_ADR_PAGE21:
-    return relocR_AARCH64_TLSDESC_ADR_PAGE21(loc, reloc, target, addend);
-  case R_AARCH64_TLSDESC_LD64_LO12_NC:
-    return relocR_AARCH64_TLSDESC_LD64_LO12_NC(loc, reloc, target, addend);
-  case R_AARCH64_TLSDESC_ADD_LO12_NC:
-    relocR_AARCH64_TLSDESC_ADD_LO12_NC(loc, reloc, target, addend);
-    break;
-  case R_AARCH64_TLSDESC_CALL:
-    // Relaxation only to optimize TLS access. Ignore for now.
-    break;
-  // Runtime only relocations. Ignore here.
-  case R_AARCH64_RELATIVE:
-  case R_AARCH64_IRELATIVE:
-  case R_AARCH64_JUMP_SLOT:
-  case R_AARCH64_GLOB_DAT:
-  case R_AARCH64_TLS_TPREL64:
-  case R_AARCH64_TLSDESC:
-    break;
-  default:
-    return make_unhandled_reloc_error();
-  }
-  return std::error_code();
-}
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h b/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h
deleted file mode 100644
index 8cde7a03e51a..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h ------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef AARCH64_RELOCATION_HANDLER_H
-#define AARCH64_RELOCATION_HANDLER_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-class AArch64TargetLayout;
-
-class AArch64TargetRelocationHandler final : public TargetRelocationHandler {
-public:
-  AArch64TargetRelocationHandler(AArch64TargetLayout &layout)
-      : _layout(layout) {}
-
-  std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
-                                  const AtomLayout &,
-                                  const Reference &) const override;
-
-private:
-  AArch64TargetLayout &_layout;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif // AArch64_RELOCATION_HANDLER_H
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp
deleted file mode 100644
index 4d94a793665c..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief Defines the relocation processing pass for AArch64. This includes
-///   GOT and PLT entries, TLS, COPY, and ifunc.
-///
-/// This also includes additional behavior that gnu-ld and gold implement but
-/// which is not specified anywhere.
-///
-//===----------------------------------------------------------------------===//
-
-#include "AArch64RelocationPass.h"
-#include "AArch64LinkingContext.h"
-#include "Atoms.h"
-#include "lld/Core/Simple.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Debug.h"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm::ELF;
-
-// .got values
-static const uint8_t AArch64GotAtomContent[8] = {0};
-
-// tls descriptor .got values, the layout is:
-// struct tlsdesc {
-//   ptrdiff_t (*entry) (struct tlsdesc *);
-//   void *arg;
-// };
-static const uint8_t AArch64TlsdescGotAtomContent[16] = {0};
-
-// .plt value (entry 0)
-static const uint8_t AArch64Plt0AtomContent[32] = {
-    0xf0, 0x7b, 0xbf, 0xa9, // stp	x16, x30, [sp,#-16]!
-    0x10, 0x00, 0x00, 0x90, // adrp	x16, Page(eh_frame)
-    0x11, 0x02, 0x40, 0xf9, // ldr	x17, [x16,#offset]
-    0x10, 0x02, 0x00, 0x91, // add	x16, x16, #offset
-    0x20, 0x02, 0x1f, 0xd6, // br	x17
-    0x1f, 0x20, 0x03, 0xd5, // nop
-    0x1f, 0x20, 0x03, 0xd5, // nop
-    0x1f, 0x20, 0x03, 0xd5  // nop
-};
-
-// .plt values (other entries)
-static const uint8_t AArch64PltAtomContent[16] = {
-    0x10, 0x00, 0x00, 0x90, // adrp x16, PAGE(<GLOBAL_OFFSET_TABLE>)
-    0x11, 0x02, 0x40, 0xf9, // ldr  x17, [x16,#offset]
-    0x10, 0x02, 0x00, 0x91, // add  x16, x16, #offset
-    0x20, 0x02, 0x1f, 0xd6  // br   x17
-};
-
-// .plt tlsdesc values
-static const uint8_t AArch64PltTlsdescAtomContent[32] = {
-    0xe2, 0x0f, 0xbf, 0xa9, // stp  x2, x3, [sp, #-16]
-    0x02, 0x00, 0x00, 0x90, // adpr x2, 0
-    0x03, 0x00, 0x00, 0x90, // adpr x3, 0
-    0x42, 0x00, 0x40, 0xf9, // ldr  x2, [x2, #0]
-    0x63, 0x00, 0x00, 0x91, // add  x3, x3, 0
-    0x40, 0x00, 0x1f, 0xd6, // br   x2
-    0x1f, 0x20, 0x03, 0xd5, // nop
-    0x1f, 0x20, 0x03, 0xd5  // nop
-};
-
-namespace {
-
-/// \brief Atoms that are used by AArch64 dynamic linking
-class AArch64GOTAtom : public GOTAtom {
-public:
-  AArch64GOTAtom(const File &f) : GOTAtom(f, ".got") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return ArrayRef<uint8_t>(AArch64GotAtomContent, 8);
-  }
-
-protected:
-  // Constructor for AArch64GOTAtom
-  AArch64GOTAtom(const File &f, StringRef secName) : GOTAtom(f, secName) {}
-};
-
-class AArch64GOTPLTAtom : public AArch64GOTAtom {
-public:
-  AArch64GOTPLTAtom(const File &f) : AArch64GOTAtom(f, ".got.plt") {}
-};
-
-class AArch64TLSDESCGOTAtom : public AArch64GOTPLTAtom {
-public:
-  AArch64TLSDESCGOTAtom(const File &f) : AArch64GOTPLTAtom(f) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return ArrayRef<uint8_t>(AArch64TlsdescGotAtomContent, 16);
-  }
-};
-
-
-class AArch64PLT0Atom : public PLT0Atom {
-public:
-  AArch64PLT0Atom(const File &f) : PLT0Atom(f) {}
-  ArrayRef<uint8_t> rawContent() const override {
-    return ArrayRef<uint8_t>(AArch64Plt0AtomContent, 32);
-  }
-};
-
-class AArch64PLTAtom : public PLTAtom {
-public:
-  AArch64PLTAtom(const File &f) : PLTAtom(f, ".plt") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return ArrayRef<uint8_t>(AArch64PltAtomContent, 16);
-  }
-};
-
-class AArch64PLTTLSDESCAtom : public PLTAtom {
-public:
-  AArch64PLTTLSDESCAtom(const File &f) : PLTAtom(f, ".plt") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return ArrayRef<uint8_t>(AArch64PltTlsdescAtomContent, 32);
-  }
-};
-
-class ELFPassFile : public SimpleFile {
-public:
-  ELFPassFile(const ELFLinkingContext &eti) : SimpleFile("ELFPassFile") {
-    setOrdinal(eti.getNextOrdinalAndIncrement());
-  }
-
-  llvm::BumpPtrAllocator _alloc;
-};
-
-/// \brief CRTP base for handling relocations.
-template <class Derived> class AArch64RelocationPass : public Pass {
-  /// \brief Handle a specific reference.
-  void handleReference(const DefinedAtom &atom, const Reference &ref) {
-    DEBUG_WITH_TYPE(
-        "AArch64", llvm::dbgs()
-                       << "\t" << LLVM_FUNCTION_NAME << "()"
-                       << ":   Name of Defined Atom: " << atom.name().str();
-        llvm::dbgs() << "   kindValue: " << ref.kindValue() << "\n");
-    if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-      return;
-    assert(ref.kindArch() == Reference::KindArch::AArch64);
-    switch (ref.kindValue()) {
-    case R_AARCH64_ABS32:
-    case R_AARCH64_ABS16:
-    case R_AARCH64_ABS64:
-    case R_AARCH64_PREL16:
-    case R_AARCH64_PREL32:
-    case R_AARCH64_PREL64:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_GOTREL32:
-    case R_AARCH64_GOTREL64:
-      static_cast<Derived *>(this)->handleGOT(ref);
-      break;
-    case R_AARCH64_ADR_PREL_PG_HI21:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_LDST8_ABS_LO12_NC:
-    case R_AARCH64_LDST16_ABS_LO12_NC:
-    case R_AARCH64_LDST32_ABS_LO12_NC:
-    case R_AARCH64_LDST64_ABS_LO12_NC:
-    case R_AARCH64_LDST128_ABS_LO12_NC:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_ADD_ABS_LO12_NC:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_CALL26:
-    case R_AARCH64_JUMP26:
-    case R_AARCH64_CONDBR19:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_TLSLE_ADD_TPREL_HI12:
-    case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
-      static_cast<Derived *>(this)->handlePlain(ref);
-      break;
-    case R_AARCH64_ADR_GOT_PAGE:
-    case R_AARCH64_LD64_GOT_LO12_NC:
-      static_cast<Derived *>(this)->handleGOT(ref);
-      break;
-    case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
-    case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
-      static_cast<Derived *>(this)->handleGOTTPREL(ref);
-      break;
-    case R_AARCH64_TLSDESC_ADR_PAGE21:
-    case R_AARCH64_TLSDESC_LD64_LO12_NC:
-    case R_AARCH64_TLSDESC_ADD_LO12_NC:
-      static_cast<Derived *>(this)->handleTLSDESC(ref);
-      break;
-    }
-  }
-
-protected:
-  /// \brief get the PLT entry for a given IFUNC Atom.
-  ///
-  /// If the entry does not exist. Both the GOT and PLT entry is created.
-  const PLTAtom *getIFUNCPLTEntry(const DefinedAtom *da) {
-    auto plt = _pltMap.find(da);
-    if (plt != _pltMap.end())
-      return plt->second;
-    auto ga = new (_file._alloc) AArch64GOTPLTAtom(_file);
-    ga->addReferenceELF_AArch64(R_AARCH64_IRELATIVE, 0, da, 0);
-    auto pa = new (_file._alloc) AArch64PLTAtom(_file);
-    pa->addReferenceELF_AArch64(R_AARCH64_PREL32, 2, ga, -4);
-#ifndef NDEBUG
-    ga->_name = "__got_ifunc_";
-    ga->_name += da->name();
-    pa->_name = "__plt_ifunc_";
-    pa->_name += da->name();
-#endif
-    _gotMap[da] = ga;
-    _pltMap[da] = pa;
-    _gotVector.push_back(ga);
-    _pltVector.push_back(pa);
-    return pa;
-  }
-
-  /// \brief Redirect the call to the PLT stub for the target IFUNC.
-  ///
-  /// This create a PLT and GOT entry for the IFUNC if one does not exist. The
-  /// GOT entry and a IRELATIVE relocation to the original target resolver.
-  std::error_code handleIFUNC(const Reference &ref) {
-    auto target = dyn_cast_or_null<const DefinedAtom>(ref.target());
-    if (target && target->contentType() == DefinedAtom::typeResolver)
-      const_cast<Reference &>(ref).setTarget(getIFUNCPLTEntry(target));
-    return std::error_code();
-  }
-
-  /// \brief Create a GOT entry for the TP offset of a TLS atom.
-  const GOTAtom *getGOTTPREL(const Atom *atom) {
-    auto got = _gotMap.find(atom);
-    if (got == _gotMap.end()) {
-      auto g = new (_file._alloc) AArch64GOTAtom(_file);
-      g->addReferenceELF_AArch64(R_AARCH64_TLS_TPREL64, 0, atom, 0);
-#ifndef NDEBUG
-      g->_name = "__got_tls_";
-      g->_name += atom->name();
-#endif
-      _gotMap[atom] = g;
-      _gotVector.push_back(g);
-      return g;
-    }
-    return got->second;
-  }
-
-  /// \brief Create a GOT TPREL entry to local or external TLS variable.
-  std::error_code handleGOTTPREL(const Reference &ref) {
-    if (isa<DefinedAtom>(ref.target()) ||
-        isa<SharedLibraryAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getGOTTPREL(ref.target()));
-    return std::error_code();
-  }
-
-  /// \brief Generates a double GOT entry with R_AARCH64_TLSDESC dynamic
-  /// relocation reference.  Since the dynamic relocation is resolved
-  /// lazily so the GOT associated should be in .got.plt.
-  const GOTAtom *getTLSDESCPLTEntry(const Atom *da) {
-    auto got = _gotMap.find(da);
-    if (got != _gotMap.end())
-      return got->second;
-    auto ga = new (_file._alloc) AArch64TLSDESCGOTAtom(_file);
-    ga->addReferenceELF_AArch64(R_AARCH64_TLSDESC, 0, da, 0);
-    auto pa = new (_file._alloc) AArch64PLTTLSDESCAtom(_file);
-    pa->addReferenceELF_AArch64(R_AARCH64_ADR_PREL_PG_HI21, 4, ga, 0);
-    pa->addReferenceELF_AArch64(R_AARCH64_ADR_PREL_PG_HI21, 8, ga, 0);
-    pa->addReferenceELF_AArch64(R_AARCH64_LDST64_ABS_LO12_NC, 12, ga, 0);
-    pa->addReferenceELF_AArch64(R_AARCH64_ADD_ABS_LO12_NC, 16, ga, 0);
-#ifndef NDEBUG
-    ga->_name = "__got_tlsdesc_";
-    ga->_name += da->name();
-    pa->_name = "__plt_tlsdesc_";
-    pa->_name += da->name();
-#endif
-    _gotMap[da] = ga;
-    _pltMap[da] = pa;
-    _tlsdescVector.push_back(ga);
-    _pltVector.push_back(pa);
-    return ga;
-  }
-
-  std::error_code handleTLSDESC(const Reference &ref) {
-    if (isa<DefinedAtom>(ref.target()) ||
-        isa<SharedLibraryAtom>(ref.target())) {
-      const_cast<Reference &>(ref).setTarget(getTLSDESCPLTEntry(ref.target()));
-    }
-    return std::error_code();
-  }
-
-  /// \brief Create a GOT entry containing 0.
-  const GOTAtom *getNullGOT() {
-    if (!_null) {
-      _null = new (_file._alloc) AArch64GOTPLTAtom(_file);
-#ifndef NDEBUG
-      _null->_name = "__got_null";
-#endif
-    }
-    return _null;
-  }
-
-  const GOTAtom *getGOT(const DefinedAtom *da) {
-    auto got = _gotMap.find(da);
-    if (got == _gotMap.end()) {
-      auto g = new (_file._alloc) AArch64GOTAtom(_file);
-      g->addReferenceELF_AArch64(R_AARCH64_ABS64, 0, da, 0);
-#ifndef NDEBUG
-      g->_name = "__got_";
-      g->_name += da->name();
-#endif
-      _gotMap[da] = g;
-      _gotVector.push_back(g);
-      return g;
-    }
-    return got->second;
-  }
-
-public:
-  AArch64RelocationPass(const ELFLinkingContext &ctx) : _file(ctx), _ctx(ctx) {}
-
-  /// \brief Do the pass.
-  ///
-  /// The goal here is to first process each reference individually. Each call
-  /// to handleReference may modify the reference itself and/or create new
-  /// atoms which must be stored in one of the maps below.
-  ///
-  /// After all references are handled, the atoms created during that are all
-  /// added to mf.
-  std::error_code perform(SimpleFile &mf) override {
-    ScopedTask task(getDefaultDomain(), "AArch64 GOT/PLT Pass");
-    DEBUG_WITH_TYPE(
-        "AArch64", llvm::dbgs() << "Undefined Atoms"
-                                << "\n";
-        for (const auto &atom
-             : mf.undefined()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        } llvm::dbgs()
-            << "Shared Library Atoms"
-            << "\n";
-        for (const auto &atom
-             : mf.sharedLibrary()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        } llvm::dbgs()
-            << "Absolute Atoms"
-            << "\n";
-        for (const auto &atom
-             : mf.absolute()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        }
-            // Process all references.
-            llvm::dbgs()
-            << "Defined Atoms"
-            << "\n");
-    for (const auto &atom : mf.defined()) {
-      for (const auto &ref : *atom) {
-        handleReference(*atom, *ref);
-      }
-    }
-
-    // Add all created atoms to the link.
-    uint64_t ordinal = 0;
-    if (_plt0) {
-      _plt0->setOrdinal(ordinal++);
-      mf.addAtom(*_plt0);
-    }
-    for (auto &plt : _pltVector) {
-      plt->setOrdinal(ordinal++);
-      mf.addAtom(*plt);
-    }
-    if (_null) {
-      _null->setOrdinal(ordinal++);
-      mf.addAtom(*_null);
-    }
-    if (_plt0) {
-      _got0->setOrdinal(ordinal++);
-      _got1->setOrdinal(ordinal++);
-      mf.addAtom(*_got0);
-      mf.addAtom(*_got1);
-    }
-    for (auto &got : _gotVector) {
-      got->setOrdinal(ordinal++);
-      mf.addAtom(*got);
-    }
-    // Add any tlsdesc GOT relocation after default PLT and iFUNC entries.
-    for (auto &tlsdesc : _tlsdescVector) {
-      tlsdesc->setOrdinal(ordinal++);
-      mf.addAtom(*tlsdesc);
-    }
-    for (auto obj : _objectVector) {
-      obj->setOrdinal(ordinal++);
-      mf.addAtom(*obj);
-    }
-
-    return std::error_code();
-  }
-
-protected:
-  /// \brief Owner of all the Atoms created by this pass.
-  ELFPassFile _file;
-  const ELFLinkingContext &_ctx;
-
-  /// \brief Map Atoms to their GOT entries.
-  llvm::DenseMap<const Atom *, GOTAtom *> _gotMap;
-
-  /// \brief Map Atoms to their PLT entries.
-  llvm::DenseMap<const Atom *, PLTAtom *> _pltMap;
-
-  /// \brief Map Atoms to their Object entries.
-  llvm::DenseMap<const Atom *, ObjectAtom *> _objectMap;
-
-  /// \brief the list of GOT/PLT atoms
-  std::vector<GOTAtom *> _gotVector;
-  std::vector<GOTAtom *> _tlsdescVector;
-  std::vector<PLTAtom *> _pltVector;
-  std::vector<ObjectAtom *> _objectVector;
-
-  /// \brief GOT entry that is always 0. Used for undefined weaks.
-  GOTAtom *_null = nullptr;
-
-  /// \brief The got and plt entries for .PLT0. This is used to call into the
-  /// dynamic linker for symbol resolution.
-  /// @{
-  PLT0Atom *_plt0 = nullptr;
-  GOTAtom *_got0 = nullptr;
-  GOTAtom *_got1 = nullptr;
-  /// @}
-};
-
-/// This implements the static relocation model. Meaning GOT and PLT entries are
-/// not created for references that can be directly resolved. These are
-/// converted to a direct relocation. For entries that do require a GOT or PLT
-/// entry, that entry is statically bound.
-///
-/// TLS always assumes module 1 and attempts to remove indirection.
-class AArch64StaticRelocationPass final
-    : public AArch64RelocationPass<AArch64StaticRelocationPass> {
-public:
-  AArch64StaticRelocationPass(const elf::AArch64LinkingContext &ctx)
-      : AArch64RelocationPass(ctx) {}
-
-  std::error_code handlePlain(const Reference &ref) { return handleIFUNC(ref); }
-
-  std::error_code handlePLT32(const Reference &ref) {
-    // __tls_get_addr is handled elsewhere.
-    if (ref.target() && ref.target()->name() == "__tls_get_addr") {
-      const_cast<Reference &>(ref).setKindValue(R_AARCH64_NONE);
-      return std::error_code();
-    }
-    // Static code doesn't need PLTs.
-    const_cast<Reference &>(ref).setKindValue(R_AARCH64_PREL32);
-    // Handle IFUNC.
-    if (const DefinedAtom *da =
-            dyn_cast_or_null<const DefinedAtom>(ref.target()))
-      if (da->contentType() == DefinedAtom::typeResolver)
-        return handleIFUNC(ref);
-    return std::error_code();
-  }
-
-  std::error_code handleGOT(const Reference &ref) {
-    if (isa<UndefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getNullGOT());
-    else if (const DefinedAtom *da = dyn_cast<const DefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getGOT(da));
-    return std::error_code();
-  }
-};
-
-class AArch64DynamicRelocationPass final
-    : public AArch64RelocationPass<AArch64DynamicRelocationPass> {
-public:
-  AArch64DynamicRelocationPass(const elf::AArch64LinkingContext &ctx)
-      : AArch64RelocationPass(ctx) {}
-
-  const PLT0Atom *getPLT0() {
-    if (_plt0)
-      return _plt0;
-    // Fill in the null entry.
-    getNullGOT();
-    _plt0 = new (_file._alloc) AArch64PLT0Atom(_file);
-    _got0 = new (_file._alloc) AArch64GOTPLTAtom(_file);
-    _got1 = new (_file._alloc) AArch64GOTPLTAtom(_file);
-    _plt0->addReferenceELF_AArch64(R_AARCH64_ADR_GOT_PAGE, 4, _got0, 0);
-    _plt0->addReferenceELF_AArch64(R_AARCH64_LD64_GOT_LO12_NC, 8, _got1, 0);
-    _plt0->addReferenceELF_AArch64(ADD_AARCH64_GOTRELINDEX, 12, _got1, 0);
-#ifndef NDEBUG
-    _plt0->_name = "__PLT0";
-    _got0->_name = "__got0";
-    _got1->_name = "__got1";
-#endif
-    return _plt0;
-  }
-
-  const PLTAtom *getPLTEntry(const Atom *a) {
-    auto plt = _pltMap.find(a);
-    if (plt != _pltMap.end())
-      return plt->second;
-    auto ga = new (_file._alloc) AArch64GOTPLTAtom(_file);
-    ga->addReferenceELF_AArch64(R_AARCH64_JUMP_SLOT, 0, a, 0);
-    auto pa = new (_file._alloc) AArch64PLTAtom(_file);
-    pa->addReferenceELF_AArch64(R_AARCH64_ADR_GOT_PAGE, 0, ga, 0);
-    pa->addReferenceELF_AArch64(R_AARCH64_LD64_GOT_LO12_NC, 4, ga, 0);
-    pa->addReferenceELF_AArch64(ADD_AARCH64_GOTRELINDEX, 8, ga, 0);
-    pa->addReferenceELF_AArch64(R_AARCH64_NONE, 12, getPLT0(), 0);
-    // Set the starting address of the got entry to the first instruction in
-    // the plt0 entry.
-    ga->addReferenceELF_AArch64(R_AARCH64_ABS32, 0, getPLT0(), 0);
-#ifndef NDEBUG
-    ga->_name = "__got_";
-    ga->_name += a->name();
-    pa->_name = "__plt_";
-    pa->_name += a->name();
-#endif
-    _gotMap[a] = ga;
-    _pltMap[a] = pa;
-    _gotVector.push_back(ga);
-    _pltVector.push_back(pa);
-    return pa;
-  }
-
-  const ObjectAtom *getObjectEntry(const SharedLibraryAtom *a) {
-    auto obj = _objectMap.find(a);
-    if (obj != _objectMap.end())
-      return obj->second;
-
-    auto oa = new (_file._alloc) ObjectAtom(_file);
-    // This needs to point to the atom that we just created.
-    oa->addReferenceELF_AArch64(R_AARCH64_COPY, 0, oa, 0);
-
-    oa->_name = a->name();
-    oa->_size = a->size();
-
-    _objectMap[a] = oa;
-    _objectVector.push_back(oa);
-    return oa;
-  }
-
-  std::error_code handlePlain(const Reference &ref) {
-    if (!ref.target())
-      return std::error_code();
-    if (auto sla = dyn_cast<SharedLibraryAtom>(ref.target())) {
-      if (sla->type() == SharedLibraryAtom::Type::Data)
-        const_cast<Reference &>(ref).setTarget(getObjectEntry(sla));
-      else if (sla->type() == SharedLibraryAtom::Type::Code)
-        const_cast<Reference &>(ref).setTarget(getPLTEntry(sla));
-    } else
-      return handleIFUNC(ref);
-    return std::error_code();
-  }
-
-  std::error_code handlePLT32(const Reference &ref) {
-    // Turn this into a PC32 to the PLT entry.
-    const_cast<Reference &>(ref).setKindValue(R_AARCH64_PREL32);
-    // Handle IFUNC.
-    if (const DefinedAtom *da =
-            dyn_cast_or_null<const DefinedAtom>(ref.target()))
-      if (da->contentType() == DefinedAtom::typeResolver)
-        return handleIFUNC(ref);
-    if (isa<const SharedLibraryAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getPLTEntry(ref.target()));
-    return std::error_code();
-  }
-
-  const GOTAtom *getSharedGOT(const SharedLibraryAtom *sla) {
-    auto got = _gotMap.find(sla);
-    if (got == _gotMap.end()) {
-      auto g = new (_file._alloc) AArch64GOTAtom(_file);
-      g->addReferenceELF_AArch64(R_AARCH64_GLOB_DAT, 0, sla, 0);
-#ifndef NDEBUG
-      g->_name = "__got_";
-      g->_name += sla->name();
-#endif
-      _gotMap[sla] = g;
-      _gotVector.push_back(g);
-      return g;
-    }
-    return got->second;
-  }
-
-  std::error_code handleGOT(const Reference &ref) {
-    if (isa<UndefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getNullGOT());
-    else if (const DefinedAtom *da = dyn_cast<const DefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getGOT(da));
-    else if (const auto sla = dyn_cast<const SharedLibraryAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getSharedGOT(sla));
-    return std::error_code();
-  }
-};
-} // end anon namespace
-
-std::unique_ptr<Pass>
-lld::elf::createAArch64RelocationPass(const AArch64LinkingContext &ctx) {
-  switch (ctx.getOutputELFType()) {
-  case llvm::ELF::ET_EXEC:
-    if (ctx.isDynamic())
-      return llvm::make_unique<AArch64DynamicRelocationPass>(ctx);
-    return llvm::make_unique<AArch64StaticRelocationPass>(ctx);
-  case llvm::ELF::ET_DYN:
-    return llvm::make_unique<AArch64DynamicRelocationPass>(ctx);
-  case llvm::ELF::ET_REL:
-    return nullptr;
-  default:
-    llvm_unreachable("Unhandled output file type");
-  }
-}
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.h b/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.h
deleted file mode 100644
index 73d784e3b52d..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.h ---------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief Declares the relocation processing pass for AArch64. This includes
-///   GOT and PLT entries, TLS, COPY, and ifunc.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_RELOCATION_PASS_H
-#define LLD_READER_WRITER_ELF_AARCH64_AARCH64_RELOCATION_PASS_H
-
-#include <memory>
-
-namespace lld {
-class Pass;
-namespace elf {
-class AArch64LinkingContext;
-
-/// \brief Create AArch64 relocation pass for the given linking context.
-std::unique_ptr<Pass>
-createAArch64RelocationPass(const AArch64LinkingContext &);
-}
-}
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.cpp
deleted file mode 100644
index 2734bcdbda5f..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.cpp --------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "AArch64SectionChunks.h"
-#include "TargetLayout.h"
-
-namespace lld {
-namespace elf {
-
-AArch64GOTSection::AArch64GOTSection(const ELFLinkingContext &ctx,
-  StringRef name, int32_t order)
-  : AtomSection<ELF64LE>(ctx, name, DefinedAtom::typeGOT, DefinedAtom::permRW_,
-    order) {
-  _alignment = 8;
-}
-
-const AtomLayout *AArch64GOTSection::appendAtom(const Atom *atom) {
-  const DefinedAtom *da = dyn_cast<DefinedAtom>(atom);
-
-  for (const auto &r : *da) {
-    if (r->kindNamespace() != Reference::KindNamespace::ELF)
-      continue;
-    assert(r->kindArch() == Reference::KindArch::AArch64);
-    if ((r->kindValue() == R_AARCH64_TLS_TPREL64) ||
-        (r->kindValue() == R_AARCH64_TLSDESC))
-      _tlsMap[r->target()] = _tlsMap.size();
-  }
-
-  return AtomSection<ELF64LE>::appendAtom(atom);
-}
-
-} // elf
-} // lld
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.h b/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.h
deleted file mode 100644
index 2b7594c2db84..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64SectionChunks.h ----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_SECTION_CHUNKS_H
-#define LLD_READER_WRITER_ELF_AARCH64_AARCH64_SECTION_CHUNKS_H
-
-#include "TargetLayout.h"
-
-namespace lld {
-namespace elf {
-
-class AArch64GOTSection : public AtomSection<ELF64LE> {
-public:
-  AArch64GOTSection(const ELFLinkingContext &ctx, StringRef name,
-                    int32_t order);
-
-  bool hasGlobalGOTEntry(const Atom *a) const {
-    return _tlsMap.count(a);
-  }
-
-  const AtomLayout *appendAtom(const Atom *atom) override;
-
-private:
-  /// \brief Map TLS Atoms to their GOT entry index.
-  llvm::DenseMap<const Atom *, std::size_t> _tlsMap;
-};
-
-} // elf
-} // lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp b/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
deleted file mode 100644
index 083b492c1607..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp --------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Atoms.h"
-#include "AArch64DynamicLibraryWriter.h"
-#include "AArch64ExecutableWriter.h"
-#include "AArch64LinkingContext.h"
-#include "AArch64TargetHandler.h"
-#include "AArch64SectionChunks.h"
-
-using namespace lld;
-using namespace elf;
-
-AArch64TargetLayout::AArch64TargetLayout(ELFLinkingContext &ctx) :
-  TargetLayout(ctx) {}
-
-AtomSection<ELF64LE> *AArch64TargetLayout::createSection(
-    StringRef name, int32_t type, DefinedAtom::ContentPermissions permissions,
-    TargetLayout<ELF64LE>::SectionOrder order) {
-  if (type == DefinedAtom::typeGOT && (name == ".got" || name == ".got.plt")) {
-    auto section = new (this->_allocator) AArch64GOTSection(this->_ctx, name,
-                        order);
-    _gotSections.push_back(section);
-    return section;
-  }
-  return TargetLayout<ELF64LE>::createSection(name, type, permissions, order);
-}
-
-
-AArch64TargetHandler::AArch64TargetHandler(AArch64LinkingContext &ctx)
-    : _ctx(ctx), _targetLayout(new AArch64TargetLayout(ctx)),
-      _relocationHandler(new AArch64TargetRelocationHandler(*_targetLayout)) {}
-
-std::unique_ptr<Writer> AArch64TargetHandler::getWriter() {
-  switch (this->_ctx.getOutputELFType()) {
-  case llvm::ELF::ET_EXEC:
-    return llvm::make_unique<AArch64ExecutableWriter>(_ctx, *_targetLayout);
-  case llvm::ELF::ET_DYN:
-    return llvm::make_unique<AArch64DynamicLibraryWriter>(_ctx, *_targetLayout);
-  case llvm::ELF::ET_REL:
-    llvm_unreachable("TODO: support -r mode");
-  default:
-    llvm_unreachable("unsupported output type");
-  }
-}
diff --git a/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
deleted file mode 100644
index c0ecbfa9e44b..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//===- lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h ----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_TARGET_HANDLER_H
-#define LLD_READER_WRITER_ELF_AARCH64_AARCH64_TARGET_HANDLER_H
-
-#include "AArch64RelocationHandler.h"
-#include "ELFReader.h"
-#include "TargetLayout.h"
-#include "lld/Core/Simple.h"
-
-namespace lld {
-namespace elf {
-
-class AArch64LinkingContext;
-class AArch64GOTSection;
-
-class AArch64TargetLayout final : public TargetLayout<ELF64LE> {
-  typedef llvm::object::Elf_Shdr_Impl<ELF64LE> Elf_Shdr;
-
-public:
-  AArch64TargetLayout(ELFLinkingContext &ctx);
-
-  AtomSection<ELF64LE> *
-  createSection(StringRef name, int32_t type,
-                DefinedAtom::ContentPermissions permissions,
-                TargetLayout<ELF64LE>::SectionOrder order) override;
-
-  const std::vector<AArch64GOTSection *> &getGOTSections() const {
-    return _gotSections;
-  }
-
-  uint64_t getTPOffset() {
-    std::call_once(_tpOffOnce, [this]() {
-      for (const auto &phdr : *_programHeader) {
-        if (phdr->p_type == llvm::ELF::PT_TLS) {
-          _tpOff = llvm::RoundUpToAlignment(TCB_SIZE, phdr->p_align);
-          break;
-        }
-      }
-      assert(_tpOff != 0 && "TLS segment not found");
-    });
-    return _tpOff;
-  }
-
-private:
-  enum {
-    TCB_SIZE = 16,
-  };
-
-private:
-  std::vector<AArch64GOTSection *> _gotSections;
-  uint64_t _tpOff = 0;
-  std::once_flag _tpOffOnce;
-};
-
-class AArch64TargetHandler final : public TargetHandler {
-public:
-  AArch64TargetHandler(AArch64LinkingContext &ctx);
-
-  const TargetRelocationHandler &getRelocationHandler() const override {
-    return *_relocationHandler;
-  }
-
-  std::unique_ptr<Reader> getObjReader() override {
-    return llvm::make_unique<ELFReader<ELFFile<ELF64LE>>>(_ctx);
-  }
-
-  std::unique_ptr<Reader> getDSOReader() override {
-    return llvm::make_unique<ELFReader<DynamicFile<ELF64LE>>>(_ctx);
-  }
-
-  std::unique_ptr<Writer> getWriter() override;
-
-private:
-  AArch64LinkingContext &_ctx;
-  std::unique_ptr<AArch64TargetLayout> _targetLayout;
-  std::unique_ptr<AArch64TargetRelocationHandler> _relocationHandler;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/AArch64/CMakeLists.txt b/lib/ReaderWriter/ELF/AArch64/CMakeLists.txt
deleted file mode 100644
index aae6420008a4..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-add_lld_library(lldAArch64ELFTarget
-  AArch64LinkingContext.cpp
-  AArch64TargetHandler.cpp
-  AArch64RelocationHandler.cpp
-  AArch64RelocationPass.cpp
-  AArch64ExecutableWriter.cpp
-  AArch64SectionChunks.cpp
-  LINK_LIBS
-    lldELF
-    lldReaderWriter
-    lldCore
-    LLVMObject
-    LLVMSupport
-  )
diff --git a/lib/ReaderWriter/ELF/AArch64/TODO.rst b/lib/ReaderWriter/ELF/AArch64/TODO.rst
deleted file mode 100644
index aa6f616ff33f..000000000000
--- a/lib/ReaderWriter/ELF/AArch64/TODO.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-ELF AArch64
-~~~~~~~~~~~
-
-Unimplemented Features
-######################
-
-* Just about everything!
-
-Unimplemented Relocations
-#########################
-
-All of these relocations are defined in:
-http://infocenter.arm.com/help/topic/com.arm.doc.ihi0056b/IHI0056B_aaelf64.pdf
-
-
diff --git a/lib/ReaderWriter/ELF/ARM/ARMDynamicLibraryWriter.h b/lib/ReaderWriter/ELF/ARM/ARMDynamicLibraryWriter.h
deleted file mode 100644
index da843b97abc0..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMDynamicLibraryWriter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- lib/ReaderWriter/ELF/ARM/ARMDynamicLibraryWriter.h -----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_DYNAMIC_LIBRARY_WRITER_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_DYNAMIC_LIBRARY_WRITER_H
-
-#include "DynamicLibraryWriter.h"
-#include "ARMELFWriters.h"
-#include "ARMLinkingContext.h"
-#include "ARMTargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-class ARMDynamicLibraryWriter
-    : public ARMELFWriter<DynamicLibraryWriter<ELF32LE>> {
-public:
-  ARMDynamicLibraryWriter(ARMLinkingContext &ctx, ARMTargetLayout &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-private:
-  ARMLinkingContext &_ctx;
-};
-
-ARMDynamicLibraryWriter::ARMDynamicLibraryWriter(ARMLinkingContext &ctx,
-                                                 ARMTargetLayout &layout)
-    : ARMELFWriter(ctx, layout), _ctx(ctx) {}
-
-void ARMDynamicLibraryWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  DynamicLibraryWriter::createImplicitFiles(result);
-  auto file = llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "ARM dynamic file");
-  file->addAbsoluteAtom(gotSymbol);
-  file->addAbsoluteAtom(dynamicSymbol);
-  result.push_back(std::move(file));
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_DYNAMIC_LIBRARY_WRITER_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMELFFile.h b/lib/ReaderWriter/ELF/ARM/ARMELFFile.h
deleted file mode 100644
index 8f5477017e55..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMELFFile.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMELFFile.h ----------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_ELF_FILE_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_ELF_FILE_H
-
-#include "ELFReader.h"
-
-namespace lld {
-namespace elf {
-
-class ARMLinkingContext;
-
-class ARMELFBaseDefinedAtom : public ELFDefinedAtom<ELF32LE> {
-public:
-  /// The values of custom content type enum must not interfere
-  /// with ones in base defined atom class' enum.
-  enum ARMContentType {
-    typeARMExidx = 0x1000,   // Identifies ARM_EXIDX section
-  };
-
-  template <typename... T>
-  ARMELFBaseDefinedAtom(T &&... args)
-      : ELFDefinedAtom<ELF32LE>(std::forward<T>(args)...) {}
-
-  DefinedAtom::ContentPermissions permissions() const override {
-    if (_permissions != DefinedAtom::permUnknown)
-      return _permissions;
-
-    switch (_section->sh_type) {
-    case llvm::ELF::SHT_ARM_EXIDX:
-      return _permissions = permR__;
-    }
-    return ELFDefinedAtom::permissions();
-  }
-
-  DefinedAtom::ContentType contentType() const override {
-    if (_contentType != DefinedAtom::typeUnknown)
-      return _contentType;
-
-    switch (_section->sh_type) {
-    case llvm::ELF::SHT_ARM_EXIDX:
-      return _contentType = (DefinedAtom::ContentType)typeARMExidx;
-    }
-    return ELFDefinedAtom::contentType();
-  }
-};
-
-class ARMELFMappingAtom : public ARMELFBaseDefinedAtom {
-public:
-  template <typename... T>
-  ARMELFMappingAtom(DefinedAtom::CodeModel model, T &&... args)
-      : ARMELFBaseDefinedAtom(std::forward<T>(args)...), _model(model) {}
-
-  DefinedAtom::CodeModel codeModel() const override { return _model; }
-
-private:
-  DefinedAtom::CodeModel _model;
-};
-
-class ARMELFDefinedAtom : public ARMELFBaseDefinedAtom {
-public:
-  template <typename... T>
-  ARMELFDefinedAtom(T &&... args)
-      : ARMELFBaseDefinedAtom(std::forward<T>(args)...) {}
-
-  bool isThumbFunc() const {
-    const auto *symbol = _symbol;
-    return symbol->getType() == llvm::ELF::STT_FUNC &&
-           (static_cast<uint64_t>(symbol->st_value) & 0x1);
-  }
-
-  /// Correct st_value for symbols addressing Thumb instructions
-  /// by removing its zero bit.
-  uint64_t getSymbolValue() const override {
-    const auto value = static_cast<uint64_t>(_symbol->st_value);
-    return isThumbFunc() ? value & ~0x1 : value;
-  }
-
-  DefinedAtom::CodeModel codeModel() const override {
-    return isThumbFunc() ? DefinedAtom::codeARMThumb : DefinedAtom::codeNA;
-  }
-};
-
-class ARMELFFile : public ELFFile<ELF32LE> {
-  typedef llvm::object::Elf_Rel_Impl<ELF32LE, false> Elf_Rel;
-
-public:
-  ARMELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx)
-      : ELFFile(std::move(mb), ctx) {}
-
-protected:
-  /// Returns initial addend; for ARM it is 0, because it is read
-  /// during the relocations applying
-  Reference::Addend getInitialAddend(ArrayRef<uint8_t>, uint64_t,
-                                     const Elf_Rel &) const override {
-    return 0;
-  }
-
-private:
-  typedef llvm::object::Elf_Sym_Impl<ELF32LE> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELF32LE> Elf_Shdr;
-
-  /// Correct st_value for symbols addressing Thumb instructions
-  /// by removing its zero bit.
-  uint64_t getSymbolValue(const Elf_Sym *symbol) const override {
-    const auto value = static_cast<uint64_t>(symbol->st_value);
-    return symbol->getType() == llvm::ELF::STT_FUNC ? value & ~0x1 : value;
-  }
-
-  /// Process the Defined symbol and create an atom for it.
-  ELFDefinedAtom<ELF32LE> *createDefinedAtom(
-      StringRef symName, StringRef sectionName, const Elf_Sym *sym,
-      const Elf_Shdr *sectionHdr, ArrayRef<uint8_t> contentData,
-      unsigned int referenceStart, unsigned int referenceEnd,
-      std::vector<ELFReference<ELF32LE> *> &referenceList) override {
-    if (symName.size() >= 2 && symName[0] == '$') {
-      switch (symName[1]) {
-      case 'a':
-        return new (_readerStorage)
-            ARMELFMappingAtom(DefinedAtom::codeARM_a, *this, symName,
-                              sectionName, sym, sectionHdr, contentData,
-                              referenceStart, referenceEnd, referenceList);
-      case 'd':
-        return new (_readerStorage)
-            ARMELFMappingAtom(DefinedAtom::codeARM_d, *this, symName,
-                              sectionName, sym, sectionHdr, contentData,
-                              referenceStart, referenceEnd, referenceList);
-      case 't':
-        return new (_readerStorage)
-            ARMELFMappingAtom(DefinedAtom::codeARM_t, *this, symName,
-                              sectionName, sym, sectionHdr, contentData,
-                              referenceStart, referenceEnd, referenceList);
-      default:
-        // Fall through and create regular defined atom.
-        break;
-      }
-    }
-    return new (_readerStorage) ARMELFDefinedAtom(
-        *this, symName, sectionName, sym, sectionHdr, contentData,
-        referenceStart, referenceEnd, referenceList);
-  }
-};
-
-} // elf
-} // lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_ELF_FILE_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMELFWriters.h b/lib/ReaderWriter/ELF/ARM/ARMELFWriters.h
deleted file mode 100644
index a842ebe53038..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMELFWriters.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//===- lib/ReaderWriter/ELF/ARM/ARMELFWriters.h ---------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_ELF_WRITERS_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_ELF_WRITERS_H
-
-#include "ARMLinkingContext.h"
-#include "ARMSymbolTable.h"
-#include "llvm/Support/ELF.h"
-
-namespace lld {
-namespace elf {
-
-template <class WriterT> class ARMELFWriter : public WriterT {
-public:
-  ARMELFWriter(ARMLinkingContext &ctx, TargetLayout<ELF32LE> &layout);
-
-  void finalizeDefaultAtomValues() override;
-
-  /// \brief Create symbol table.
-  unique_bump_ptr<SymbolTable<ELF32LE>> createSymbolTable() override;
-
-  // Setup the ELF header.
-  std::error_code setELFHeader() override;
-
-protected:
-  static const char *gotSymbol;
-  static const char *dynamicSymbol;
-
-private:
-  ARMLinkingContext &_ctx;
-  TargetLayout<ELF32LE> &_armLayout;
-};
-
-template <class WriterT>
-const char *ARMELFWriter<WriterT>::gotSymbol = "_GLOBAL_OFFSET_TABLE_";
-template <class WriterT>
-const char *ARMELFWriter<WriterT>::dynamicSymbol = "_DYNAMIC";
-
-template <class WriterT>
-ARMELFWriter<WriterT>::ARMELFWriter(ARMLinkingContext &ctx,
-                                    TargetLayout<ELF32LE> &layout)
-    : WriterT(ctx, layout), _ctx(ctx), _armLayout(layout) {}
-
-template <class WriterT>
-void ARMELFWriter<WriterT>::finalizeDefaultAtomValues() {
-  // Finalize the atom values that are part of the parent.
-  WriterT::finalizeDefaultAtomValues();
-
-  if (auto *gotAtom = _armLayout.findAbsoluteAtom(gotSymbol)) {
-    if (auto gotpltSection = _armLayout.findOutputSection(".got.plt"))
-      gotAtom->_virtualAddr = gotpltSection->virtualAddr();
-    else if (auto gotSection = _armLayout.findOutputSection(".got"))
-      gotAtom->_virtualAddr = gotSection->virtualAddr();
-    else
-      gotAtom->_virtualAddr = 0;
-  }
-
-  if (auto *dynamicAtom = _armLayout.findAbsoluteAtom(dynamicSymbol)) {
-    if (auto dynamicSection = _armLayout.findOutputSection(".dynamic"))
-      dynamicAtom->_virtualAddr = dynamicSection->virtualAddr();
-    else
-      dynamicAtom->_virtualAddr = 0;
-  }
-
-  // Set required by gcc libc __ehdr_start symbol with pointer to ELF header
-  if (auto ehdr = _armLayout.findAbsoluteAtom("__ehdr_start"))
-    ehdr->_virtualAddr = this->_elfHeader->virtualAddr();
-
-  // Set required by gcc libc symbols __exidx_start/__exidx_end
-  this->updateScopeAtomValues("exidx", ".ARM.exidx");
-}
-
-template <class WriterT>
-unique_bump_ptr<SymbolTable<ELF32LE>>
-ARMELFWriter<WriterT>::createSymbolTable() {
-  return unique_bump_ptr<SymbolTable<ELF32LE>>(new (this->_alloc)
-                                                   ARMSymbolTable(_ctx));
-}
-
-template <class WriterT> std::error_code ARMELFWriter<WriterT>::setELFHeader() {
-  if (std::error_code ec = WriterT::setELFHeader())
-    return ec;
-
-  // Set ARM-specific flags.
-  this->_elfHeader->e_flags(llvm::ELF::EF_ARM_EABI_VER5 |
-                            llvm::ELF::EF_ARM_VFP_FLOAT);
-
-  StringRef entryName = _ctx.entrySymbolName();
-  if (const AtomLayout *al = _armLayout.findAtomLayoutByName(entryName)) {
-    if (const auto *ea = dyn_cast<DefinedAtom>(al->_atom)) {
-      switch (ea->codeModel()) {
-      case DefinedAtom::codeNA:
-        if (al->_virtualAddr & 0x3) {
-          llvm::report_fatal_error(
-              "Two least bits must be zero for ARM entry point");
-        }
-        break;
-      case DefinedAtom::codeARMThumb:
-        // Fixup entry point for Thumb code.
-        this->_elfHeader->e_entry(al->_virtualAddr | 0x1);
-        break;
-      default:
-        llvm_unreachable("Wrong code model of entry point atom");
-      }
-    }
-  }
-
-  return std::error_code();
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_ELF_WRITERS_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h b/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h
deleted file mode 100644
index 974dab63a126..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_EXECUTABLE_WRITER_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_EXECUTABLE_WRITER_H
-
-#include "ExecutableWriter.h"
-#include "ARMELFWriters.h"
-#include "ARMLinkingContext.h"
-#include "ARMTargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-class ARMExecutableWriter : public ARMELFWriter<ExecutableWriter<ELF32LE>> {
-public:
-  ARMExecutableWriter(ARMLinkingContext &ctx, ARMTargetLayout &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void processUndefinedSymbol(StringRef symName,
-                              RuntimeFile<ELF32LE> &file) const override;
-
-private:
-  ARMLinkingContext &_ctx;
-};
-
-ARMExecutableWriter::ARMExecutableWriter(ARMLinkingContext &ctx,
-                                         ARMTargetLayout &layout)
-    : ARMELFWriter(ctx, layout), _ctx(ctx) {}
-
-void ARMExecutableWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  ExecutableWriter::createImplicitFiles(result);
-  // Add default atoms for ARM.
-  if (_ctx.isDynamic()) {
-    auto file = llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "ARM exec file");
-    file->addAbsoluteAtom(gotSymbol);
-    file->addAbsoluteAtom(dynamicSymbol);
-    result.push_back(std::move(file));
-  }
-}
-
-void ARMExecutableWriter::processUndefinedSymbol(
-    StringRef symName, RuntimeFile<ELF32LE> &file) const {
-  ARMELFWriter<ExecutableWriter<ELF32LE>>::processUndefinedSymbol(symName,
-                                                                  file);
-  if (symName == gotSymbol) {
-    file.addAbsoluteAtom(gotSymbol);
-  } else if (symName.startswith("__exidx")) {
-    file.addAbsoluteAtom("__exidx_start");
-    file.addAbsoluteAtom("__exidx_end");
-  } else if (symName == "__ehdr_start") {
-    file.addAbsoluteAtom("__ehdr_start");
-  }
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_EXECUTABLE_WRITER_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp b/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp
deleted file mode 100644
index 74905b47820f..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ARMLinkingContext.h"
-#include "ARMRelocationPass.h"
-#include "ARMTargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-std::unique_ptr<ELFLinkingContext>
-createARMLinkingContext(llvm::Triple triple) {
-  if (triple.getArch() == llvm::Triple::arm)
-    return llvm::make_unique<ARMLinkingContext>(triple);
-  return nullptr;
-}
-
-ARMLinkingContext::ARMLinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(triple, llvm::make_unique<ARMTargetHandler>(*this)) {}
-
-void ARMLinkingContext::addPasses(PassManager &pm) {
-  auto pass = createARMRelocationPass(*this);
-  if (pass)
-    pm.add(std::move(pass));
-  ELFLinkingContext::addPasses(pm);
-}
-
-bool isARMCode(const DefinedAtom *atom) {
-  return isARMCode(atom->codeModel());
-}
-
-bool isARMCode(DefinedAtom::CodeModel codeModel) {
-  return !isThumbCode(codeModel);
-}
-
-bool isThumbCode(const DefinedAtom *atom) {
-  return isThumbCode(atom->codeModel());
-}
-
-bool isThumbCode(DefinedAtom::CodeModel codeModel) {
-  return codeModel == DefinedAtom::codeARMThumb ||
-         codeModel == DefinedAtom::codeARM_t;
-}
-
-static const Registry::KindStrings kindStrings[] = {
-#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
-#include "llvm/Support/ELFRelocs/ARM.def"
-#undef ELF_RELOC
-  LLD_KIND_STRING_END
-};
-
-void ARMLinkingContext::registerRelocationNames(Registry &registry) {
-  registry.addKindTable(Reference::KindNamespace::ELF, Reference::KindArch::ARM,
-                        kindStrings);
-}
-
-} // namespace elf
-} // namespace lld
diff --git a/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h b/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h
deleted file mode 100644
index f687713b25b8..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h ---------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_LINKING_CONTEXT_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_LINKING_CONTEXT_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/ELF.h"
-
-namespace lld {
-namespace elf {
-
-class ARMLinkingContext final : public ELFLinkingContext {
-public:
-  int getMachineType() const override { return llvm::ELF::EM_ARM; }
-  ARMLinkingContext(llvm::Triple);
-
-  void addPasses(PassManager &) override;
-  void registerRelocationNames(Registry &r) override;
-
-  bool isRelaOutputFormat() const override { return false; }
-
-  uint64_t getBaseAddress() const override {
-    if (_baseAddress == 0)
-      return 0x400000;
-    return _baseAddress;
-  }
-
-  bool isDynamicRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::ARM);
-    switch (r.kindValue()) {
-    case llvm::ELF::R_ARM_GLOB_DAT:
-    case llvm::ELF::R_ARM_TLS_TPOFF32:
-    case llvm::ELF::R_ARM_COPY:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  bool isCopyRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::ARM);
-    return r.kindValue() == llvm::ELF::R_ARM_COPY;
-  }
-
-  bool isPLTRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    assert(r.kindArch() == Reference::KindArch::ARM);
-    switch (r.kindValue()) {
-    case llvm::ELF::R_ARM_JUMP_SLOT:
-    case llvm::ELF::R_ARM_IRELATIVE:
-      return true;
-    default:
-      return false;
-    }
-  }
-};
-
-// Special methods to check code model of atoms.
-bool isARMCode(const DefinedAtom *atom);
-bool isARMCode(DefinedAtom::CodeModel codeModel);
-bool isThumbCode(const DefinedAtom *atom);
-bool isThumbCode(DefinedAtom::CodeModel codeModel);
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp b/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
deleted file mode 100644
index 97b149133ff2..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
+++ /dev/null
@@ -1,680 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp ----------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ARMTargetHandler.h"
-#include "ARMLinkingContext.h"
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/MathExtras.h"
-
-#define DEBUG_TYPE "ARM"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm::support::endian;
-
-static Reference::Addend readAddend_THM_MOV(const uint8_t *location) {
-  const uint16_t halfHi = read16le(location);
-  const uint16_t halfLo = read16le(location + 2);
-
-  const uint16_t imm8 = halfLo & 0xFF;
-  const uint16_t imm3 = (halfLo >> 12) & 0x7;
-
-  const uint16_t imm4 = halfHi & 0xF;
-  const uint16_t bitI = (halfHi >> 10) & 0x1;
-
-  const auto result = int16_t((imm4 << 12) | (bitI << 11) | (imm3 << 8) | imm8);
-  return result;
-}
-
-static Reference::Addend readAddend_ARM_MOV(const uint8_t *location) {
-  const uint32_t value = read32le(location);
-
-  const uint32_t imm12 = value & 0xFFF;
-  const uint32_t imm4 = (value >> 16) & 0xF;
-
-  const auto result = int32_t((imm4 << 12) | imm12);
-  return result;
-}
-
-static Reference::Addend readAddend_THM_CALL(const uint8_t *location) {
-  const uint16_t halfHi = read16le(location);
-  const uint16_t halfLo = read16le(location + 2);
-
-  const uint16_t imm10 = halfHi & 0x3FF;
-  const uint16_t bitS = (halfHi >> 10) & 0x1;
-
-  const uint16_t imm11 = halfLo & 0x7FF;
-  const uint16_t bitJ2 = (halfLo >> 11) & 0x1;
-  const uint16_t bitI2 = (~(bitJ2 ^ bitS)) & 0x1;
-  const uint16_t bitJ1 = (halfLo >> 13) & 0x1;
-  const uint16_t bitI1 = (~(bitJ1 ^ bitS)) & 0x1;
-
-  const auto result = int32_t((bitS << 24) | (bitI1 << 23) | (bitI2 << 22) |
-                              (imm10 << 12) | (imm11 << 1));
-  return llvm::SignExtend64<25>(result);
-}
-
-static Reference::Addend readAddend_ARM_CALL(const uint8_t *location) {
-  const uint32_t value = read32le(location);
-
-  const bool isBLX = (value & 0xF0000000) == 0xF0000000;
-  const uint32_t bitH = isBLX ? ((value & 0x1000000) >> 24) : 0;
-
-  const auto result = int32_t(((value & 0xFFFFFF) << 2) | (bitH << 1));
-  return llvm::SignExtend64<26>(result);
-}
-
-static Reference::Addend readAddend_THM_JUMP11(const uint8_t *location) {
-  const auto value = read16le(location);
-  const uint16_t imm11 = value & 0x7FF;
-
-  return llvm::SignExtend64<12>(imm11 << 1);
-}
-
-static Reference::Addend readAddend(const uint8_t *location,
-                                    Reference::KindValue kindValue) {
-  switch (kindValue) {
-  case R_ARM_ABS32:
-  case R_ARM_REL32:
-  case R_ARM_TARGET1:
-  case R_ARM_GOT_BREL:
-  case R_ARM_BASE_PREL:
-  case R_ARM_TLS_IE32:
-  case R_ARM_TLS_LE32:
-  case R_ARM_TLS_TPOFF32:
-    return (int32_t)read32le(location);
-  case R_ARM_PREL31:
-    return llvm::SignExtend64<31>(read32le(location) & 0x7FFFFFFF);
-  case R_ARM_THM_CALL:
-  case R_ARM_THM_JUMP24:
-    return readAddend_THM_CALL(location);
-  case R_ARM_THM_JUMP11:
-    return readAddend_THM_JUMP11(location);
-  case R_ARM_CALL:
-  case R_ARM_JUMP24:
-    return readAddend_ARM_CALL(location);
-  case R_ARM_MOVW_ABS_NC:
-  case R_ARM_MOVT_ABS:
-    return readAddend_ARM_MOV(location);
-  case R_ARM_THM_MOVW_ABS_NC:
-  case R_ARM_THM_MOVT_ABS:
-    return readAddend_THM_MOV(location);
-  default:
-    return 0;
-  }
-}
-
-static inline void report_unsupported_range_group_reloc_error() {
-  llvm::report_fatal_error(
-      "Negative offsets for group relocations are not implemented");
-}
-
-static inline std::error_code applyArmReloc(uint8_t *location, uint32_t result,
-                                            uint32_t mask = 0xFFFFFFFF) {
-  assert(!(result & ~mask));
-  write32le(location, (read32le(location) & ~mask) | (result & mask));
-  return std::error_code();
-}
-
-static inline std::error_code applyThumb32Reloc(uint8_t *location,
-                                                uint16_t resHi, uint16_t resLo,
-                                                uint16_t maskHi,
-                                                uint16_t maskLo = 0xFFFF) {
-  assert(!(resHi & ~maskHi) && !(resLo & ~maskLo));
-  write16le(location, (read16le(location) & ~maskHi) | (resHi & maskHi));
-  location += 2;
-  write16le(location, (read16le(location) & ~maskLo) | (resLo & maskLo));
-  return std::error_code();
-}
-
-static inline std::error_code
-applyThumb16Reloc(uint8_t *location, uint16_t result, uint16_t mask = 0xFFFF) {
-  assert(!(result & ~mask));
-  write16le(location, (read16le(location) & ~mask) | (result & mask));
-  return std::error_code();
-}
-
-/// \brief R_ARM_ABS32 - (S + A) | T
-static std::error_code relocR_ARM_ABS32(uint8_t *location, uint64_t P,
-                                        uint64_t S, int64_t A,
-                                        bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)((S + A) | T);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_REL32 - ((S + A) | T) - P
-static std::error_code relocR_ARM_REL32(uint8_t *location, uint64_t P,
-                                        uint64_t S, int64_t A,
-                                        bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_PREL31 - ((S + A) | T) - P
-static std::error_code relocR_ARM_PREL31(uint8_t *location, uint64_t P,
-                                         uint64_t S, int64_t A,
-                                         bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-  if (!llvm::isInt<31>((int32_t)result))
-    return make_out_of_range_reloc_error();
-
-  const uint32_t mask = 0x7FFFFFFF;
-  uint32_t rel31 = result & mask;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result);
-        llvm::dbgs() << " rel31: 0x" << Twine::utohexstr(rel31) << "\n");
-
-  return applyArmReloc(location, rel31, mask);
-}
-
-/// \brief Relocate B/BL instructions. useJs defines whether J1 & J2 are used
-static std::error_code relocR_ARM_THM_B_L(uint8_t *location, uint32_t result,
-                                          bool useJs) {
-  if ((useJs && !llvm::isInt<25>((int32_t)result)) ||
-      (!useJs && !llvm::isInt<23>((int32_t)result)))
-    return make_out_of_range_reloc_error();
-
-  result = (result & 0x01FFFFFE) >> 1;
-
-  const uint16_t imm10 = (result >> 11) & 0x3FF;
-  const uint16_t bitS = (result >> 23) & 0x1;
-  const uint16_t resHi = (bitS << 10) | imm10;
-
-  const uint16_t imm11 = result & 0x7FF;
-  const uint16_t bitJ2 = useJs ? ((result >> 21) & 0x1) : bitS;
-  const uint16_t bitI2 = (~(bitJ2 ^ bitS)) & 0x1;
-  const uint16_t bitJ1 = useJs ? ((result >> 22) & 0x1) : bitS;
-  const uint16_t bitI1 = (~(bitJ1 ^ bitS)) & 0x1;
-  const uint16_t resLo = (bitI1 << 13) | (bitI2 << 11) | imm11;
-
-  return applyThumb32Reloc(location, resHi, resLo, 0x7FF, 0x2FFF);
-}
-
-/// \brief R_ARM_THM_CALL - ((S + A) | T) - P
-static std::error_code relocR_ARM_THM_CALL(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A, bool useJs,
-                                           bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  const bool switchMode = !addressesThumb;
-
-  if (switchMode) {
-    P &= ~0x3; // Align(P, 4) by rounding down
-  }
-
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  if (auto ec = relocR_ARM_THM_B_L(location, result, useJs))
-    return ec;
-
-  if (switchMode) {
-    return applyThumb32Reloc(location, 0, 0, 0, 0x1001);
-  }
-  return std::error_code();
-}
-
-/// \brief R_ARM_THM_JUMP24 - ((S + A) | T) - P
-static std::error_code relocR_ARM_THM_JUMP24(uint8_t *location, uint64_t P,
-                                             uint64_t S, int64_t A,
-                                             bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return relocR_ARM_THM_B_L(location, result, true);
-}
-
-/// \brief R_ARM_THM_JUMP11 - S + A - P
-static std::error_code relocR_ARM_THM_JUMP11(uint8_t *location, uint64_t P,
-                                             uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A - P);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-
-  if (!llvm::isInt<12>((int32_t)result))
-    return make_out_of_range_reloc_error();
-
-  // we cut off first bit because it is always 1 according to p. 4.5.3
-  result = (result & 0x0FFE) >> 1;
-  return applyThumb16Reloc(location, result, 0x7FF);
-}
-
-/// \brief R_ARM_BASE_PREL - B(S) + A - P => S + A - P
-static std::error_code relocR_ARM_BASE_PREL(uint8_t *location, uint64_t P,
-                                            uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A - P);
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_GOT_BREL - GOT(S) + A - GOT_ORG => S + A - GOT_ORG
-static std::error_code relocR_ARM_GOT_BREL(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A,
-                                           uint64_t GOT_ORG) {
-  uint32_t result = (uint32_t)(S + A - GOT_ORG);
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_CALL - ((S + A) | T) - P
-static std::error_code relocR_ARM_CALL(uint8_t *location, uint64_t P,
-                                       uint64_t S, int64_t A,
-                                       bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  const bool switchMode = addressesThumb;
-
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-  if (!llvm::isInt<26>((int32_t)result))
-    return make_out_of_range_reloc_error();
-
-  const uint32_t imm24 = (result & 0x03FFFFFC) >> 2;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  if (auto ec = applyArmReloc(location, imm24, 0xFFFFFF))
-    return ec;
-
-  if (switchMode) {
-    const uint32_t bitH = (result & 0x2) >> 1;
-    return applyArmReloc(location, (0xFA | bitH) << 24, 0xFF000000);
-  }
-  return std::error_code();
-}
-
-/// \brief R_ARM_JUMP24 - ((S + A) | T) - P
-static std::error_code relocR_ARM_JUMP24(uint8_t *location, uint64_t P,
-                                         uint64_t S, int64_t A,
-                                         bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)(((S + A) | T) - P);
-  if (!llvm::isInt<26>((int32_t)result))
-    return make_out_of_range_reloc_error();
-
-  const uint32_t imm24 = (result & 0x03FFFFFC) >> 2;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, imm24, 0xFFFFFF);
-}
-
-/// \brief Relocate ARM MOVW/MOVT instructions
-static std::error_code relocR_ARM_MOV(uint8_t *location, uint32_t result) {
-  const uint32_t imm12 = result & 0xFFF;
-  const uint32_t imm4 = (result >> 12) & 0xF;
-
-  return applyArmReloc(location, (imm4 << 16) | imm12, 0xF0FFF);
-}
-
-/// \brief R_ARM_MOVW_ABS_NC - (S + A) | T
-static std::error_code relocR_ARM_MOVW_ABS_NC(uint8_t *location, uint64_t P,
-                                              uint64_t S, int64_t A,
-                                              bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)((S + A) | T);
-  const uint32_t arg = result & 0x0000FFFF;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return relocR_ARM_MOV(location, arg);
-}
-
-/// \brief R_ARM_MOVT_ABS - S + A
-static std::error_code relocR_ARM_MOVT_ABS(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A);
-  const uint32_t arg = (result & 0xFFFF0000) >> 16;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return relocR_ARM_MOV(location, arg);
-}
-
-/// \brief Relocate Thumb MOVW/MOVT instructions
-static std::error_code relocR_ARM_THM_MOV(uint8_t *location, uint32_t result) {
-  const uint16_t imm8 = result & 0xFF;
-  const uint16_t imm3 = (result >> 8) & 0x7;
-  const uint16_t resLo = (imm3 << 12) | imm8;
-
-  const uint16_t imm4 = (result >> 12) & 0xF;
-  const uint16_t bitI = (result >> 11) & 0x1;
-  const uint16_t resHi = (bitI << 10) | imm4;
-
-  return applyThumb32Reloc(location, resHi, resLo, 0x40F, 0x70FF);
-}
-
-/// \brief R_ARM_THM_MOVW_ABS_NC - (S + A) | T
-static std::error_code relocR_ARM_THM_MOVW_ABS_NC(uint8_t *location, uint64_t P,
-                                                  uint64_t S, int64_t A,
-                                                  bool addressesThumb) {
-  uint64_t T = addressesThumb;
-  uint32_t result = (uint32_t)((S + A) | T);
-  const uint32_t arg = result & 0x0000FFFF;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " T: 0x" << Twine::utohexstr(T);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return relocR_ARM_THM_MOV(location, arg);
-}
-
-/// \brief R_ARM_THM_MOVT_ABS - S + A
-static std::error_code relocR_ARM_THM_MOVT_ABS(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A);
-  const uint32_t arg = (result & 0xFFFF0000) >> 16;
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return relocR_ARM_THM_MOV(location, arg);
-}
-
-/// \brief R_ARM_TLS_IE32 - GOT(S) + A - P => S + A - P
-static std::error_code relocR_ARM_TLS_IE32(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A - P);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_TLS_LE32 - S + A - tp => S + A + tpoff
-static std::error_code relocR_ARM_TLS_LE32(uint8_t *location, uint64_t P,
-                                           uint64_t S, int64_t A,
-                                           uint64_t tpoff) {
-  uint32_t result = (uint32_t)(S + A + tpoff);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-/// \brief R_ARM_TLS_TPOFF32 - S + A - tp => S + A (offset within TLS block)
-static std::error_code relocR_ARM_TLS_TPOFF32(uint8_t *location, uint64_t P,
-                                              uint64_t S, int64_t A) {
-  uint32_t result = (uint32_t)(S + A);
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
-  return applyArmReloc(location, result);
-}
-
-template <uint32_t lshift>
-static std::error_code relocR_ARM_ALU_PC_GN_NC(uint8_t *location,
-                                               uint32_t result) {
-  static_assert(lshift < 32 && lshift % 2 == 0,
-                "lshift must be even and less than word size");
-
-  const uint32_t rshift = 32 - lshift;
-  result = ((result >> lshift) & 0xFF) | ((rshift / 2) << 8);
-
-  return applyArmReloc(location, result, 0xFFF);
-}
-
-/// \brief R_ARM_ALU_PC_G0_NC - ((S + A) | T) - P => S + A - P
-static std::error_code relocR_ARM_ALU_PC_G0_NC(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A - P);
-  if (result < 0)
-    report_unsupported_range_group_reloc_error();
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr((uint32_t)result)
-                     << "\n");
-
-  return relocR_ARM_ALU_PC_GN_NC<20>(location, (uint32_t)result);
-}
-
-/// \brief R_ARM_ALU_PC_G1_NC - ((S + A) | T) - P => S + A - P
-static std::error_code relocR_ARM_ALU_PC_G1_NC(uint8_t *location, uint64_t P,
-                                               uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A - P);
-  if (result < 0)
-    report_unsupported_range_group_reloc_error();
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr((uint32_t)result)
-                     << "\n");
-
-  return relocR_ARM_ALU_PC_GN_NC<12>(location, (uint32_t)result);
-}
-
-/// \brief R_ARM_LDR_PC_G2 - S + A - P
-static std::error_code relocR_ARM_LDR_PC_G2(uint8_t *location, uint64_t P,
-                                            uint64_t S, int64_t A) {
-  int32_t result = (int32_t)(S + A - P);
-  if (result < 0)
-    report_unsupported_range_group_reloc_error();
-
-  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
-        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
-        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
-        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
-        llvm::dbgs() << " result: 0x" << Twine::utohexstr((uint32_t)result)
-                     << "\n");
-
-  const uint32_t mask = 0xFFF;
-  return applyArmReloc(location, (uint32_t)result & mask, mask);
-}
-
-/// \brief Fixup unresolved weak reference with NOP instruction
-static bool fixupUnresolvedWeakCall(uint8_t *location,
-                                    Reference::KindValue kindValue) {
-  // TODO: workaround for archs without NOP instruction
-  switch (kindValue) {
-  case R_ARM_THM_CALL:
-  case R_ARM_THM_JUMP24:
-    // Thumb32 NOP.W
-    write32le(location, 0x8000F3AF);
-    break;
-  case R_ARM_THM_JUMP11:
-    // Thumb16 NOP
-    write16le(location, 0xBF00);
-    break;
-  case R_ARM_CALL:
-  case R_ARM_JUMP24:
-    // A1 NOP<c>, save condition bits
-    applyArmReloc(location, 0x320F000, 0xFFFFFFF);
-    break;
-  default:
-    return false;
-  }
-
-  return true;
-}
-
-std::error_code ARMTargetRelocationHandler::applyRelocation(
-    ELFWriter &writer, llvm::FileOutputBuffer &buf, const AtomLayout &atom,
-    const Reference &ref) const {
-  uint8_t *atomContent = buf.getBufferStart() + atom._fileOffset;
-  uint8_t *loc = atomContent + ref.offsetInAtom();
-  uint64_t target = writer.addressOfAtom(ref.target());
-  uint64_t reloc = atom._virtualAddr + ref.offsetInAtom();
-
-  if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-    return std::error_code();
-  assert(ref.kindArch() == Reference::KindArch::ARM);
-
-  // Fixup unresolved weak references
-  if (!target) {
-    bool isCallFixed = fixupUnresolvedWeakCall(loc, ref.kindValue());
-
-    if (isCallFixed) {
-      DEBUG(llvm::dbgs() << "\t\tFixup unresolved weak reference '";
-            llvm::dbgs() << ref.target()->name() << "'";
-            llvm::dbgs() << " at address: 0x" << Twine::utohexstr(reloc);
-            llvm::dbgs() << (isCallFixed ? "\n" : " isn't possible\n"));
-      return std::error_code();
-    }
-  }
-
-  // Calculate proper initial addend for the relocation
-  const Reference::Addend addend =
-      readAddend(loc, ref.kindValue()) + ref.addend();
-
-  // Flags that the relocation addresses Thumb instruction
-  bool thumb = false;
-  if (const auto *definedAtom = dyn_cast<DefinedAtom>(ref.target())) {
-    thumb = isThumbCode(definedAtom);
-  }
-
-  switch (ref.kindValue()) {
-  case R_ARM_NONE:
-    return std::error_code();
-  case R_ARM_ABS32:
-    return relocR_ARM_ABS32(loc, reloc, target, addend, thumb);
-  case R_ARM_REL32:
-    return relocR_ARM_REL32(loc, reloc, target, addend, thumb);
-  case R_ARM_TARGET1:
-    if (_armLayout.target1Rel())
-      return relocR_ARM_REL32(loc, reloc, target, addend, thumb);
-    else
-      return relocR_ARM_ABS32(loc, reloc, target, addend, thumb);
-  case R_ARM_THM_CALL:
-    // TODO: consider adding bool variable to disable J1 & J2 for archs
-    // before ARMv6
-    return relocR_ARM_THM_CALL(loc, reloc, target, addend, true, thumb);
-  case R_ARM_CALL:
-    return relocR_ARM_CALL(loc, reloc, target, addend, thumb);
-  case R_ARM_JUMP24:
-    return relocR_ARM_JUMP24(loc, reloc, target, addend, thumb);
-  case R_ARM_THM_JUMP24:
-    return relocR_ARM_THM_JUMP24(loc, reloc, target, addend, thumb);
-  case R_ARM_THM_JUMP11:
-    return relocR_ARM_THM_JUMP11(loc, reloc, target, addend);
-  case R_ARM_MOVW_ABS_NC:
-    return relocR_ARM_MOVW_ABS_NC(loc, reloc, target, addend, thumb);
-  case R_ARM_MOVT_ABS:
-    return relocR_ARM_MOVT_ABS(loc, reloc, target, addend);
-  case R_ARM_THM_MOVW_ABS_NC:
-    return relocR_ARM_THM_MOVW_ABS_NC(loc, reloc, target, addend, thumb);
-  case R_ARM_THM_MOVT_ABS:
-    return relocR_ARM_THM_MOVT_ABS(loc, reloc, target, addend);
-  case R_ARM_PREL31:
-    return relocR_ARM_PREL31(loc, reloc, target, addend, thumb);
-  case R_ARM_TLS_IE32:
-    return relocR_ARM_TLS_IE32(loc, reloc, target, addend);
-  case R_ARM_TLS_LE32:
-    return relocR_ARM_TLS_LE32(loc, reloc, target, addend,
-                               _armLayout.getTPOffset());
-  case R_ARM_TLS_TPOFF32:
-    return relocR_ARM_TLS_TPOFF32(loc, reloc, target, addend);
-  case R_ARM_GOT_BREL:
-    return relocR_ARM_GOT_BREL(loc, reloc, target, addend,
-                               _armLayout.getGOTSymAddr());
-  case R_ARM_BASE_PREL:
-    // GOT origin is used for NULL symbol and when explicitly specified
-    if (!target || ref.target()->name().equals("_GLOBAL_OFFSET_TABLE_")) {
-      target = _armLayout.getGOTSymAddr();
-    } else {
-      return make_dynamic_error_code(
-          "Segment-base relative addressing is not supported");
-    }
-    return relocR_ARM_BASE_PREL(loc, reloc, target, addend);
-  case R_ARM_ALU_PC_G0_NC:
-    return relocR_ARM_ALU_PC_G0_NC(loc, reloc, target, addend);
-  case R_ARM_ALU_PC_G1_NC:
-    return relocR_ARM_ALU_PC_G1_NC(loc, reloc, target, addend);
-  case R_ARM_LDR_PC_G2:
-    return relocR_ARM_LDR_PC_G2(loc, reloc, target, addend);
-  case R_ARM_JUMP_SLOT:
-  case R_ARM_GLOB_DAT:
-  case R_ARM_IRELATIVE:
-    // Runtime only relocations. Ignore here.
-    return std::error_code();
-  case R_ARM_V4BX:
-    // TODO implement
-    return std::error_code();
-  default:
-    return make_unhandled_reloc_error();
-  }
-
-  llvm_unreachable("All switch cases must return directly");
-}
diff --git a/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h b/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h
deleted file mode 100644
index a1f3d091f204..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h ------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_HANDLER_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_HANDLER_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-class ARMTargetLayout;
-
-class ARMTargetRelocationHandler final : public TargetRelocationHandler {
-public:
-  ARMTargetRelocationHandler(ARMTargetLayout &layout) : _armLayout(layout) {}
-
-  std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
-                                  const AtomLayout &,
-                                  const Reference &) const override;
-
-private:
-  ARMTargetLayout &_armLayout;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_HANDLER_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp b/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp
deleted file mode 100644
index fc2ae75cd7a7..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp
+++ /dev/null
@@ -1,985 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief Defines the relocation processing pass for ARM. This includes
-///   GOT and PLT entries, TLS, COPY, and ifunc.
-///
-/// This also includes additional behavior that gnu-ld and gold implement but
-/// which is not specified anywhere.
-///
-//===----------------------------------------------------------------------===//
-
-#include "ARMRelocationPass.h"
-#include "ARMLinkingContext.h"
-#include "Atoms.h"
-#include "lld/Core/Simple.h"
-#include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Debug.h"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm::ELF;
-
-namespace {
-// ARM B/BL instructions of absolute relocation veneer.
-// TODO: consider different instruction set for archs below ARMv5
-// (one as for Thumb may be used though it's less optimal).
-static const uint8_t Veneer_ARM_B_BL_Abs_a_AtomContent[4] = {
-    0x04, 0xf0, 0x1f, 0xe5   // ldr pc, [pc, #-4]
-};
-static const uint8_t Veneer_ARM_B_BL_Abs_d_AtomContent[4] = {
-    0x00, 0x00, 0x00, 0x00   // <target_symbol_address>
-};
-
-// Thumb B/BL instructions of absolute relocation veneer.
-// TODO: consider different instruction set for archs above ARMv5
-// (one as for ARM may be used since it's more optimal).
-static const uint8_t Veneer_THM_B_BL_Abs_t_AtomContent[4] = {
-    0x78, 0x47,              // bx pc
-    0x00, 0x00               // nop
-};
-static const uint8_t Veneer_THM_B_BL_Abs_a_AtomContent[4] = {
-    0xfe, 0xff, 0xff, 0xea   // b <target_symbol_address>
-};
-
-// .got values
-static const uint8_t ARMGotAtomContent[4] = {0};
-
-// .plt value (entry 0)
-static const uint8_t ARMPlt0_a_AtomContent[16] = {
-    0x04, 0xe0, 0x2d, 0xe5,  // push {lr}
-    0x04, 0xe0, 0x9f, 0xe5,  // ldr lr, [pc, #4]
-    0x0e, 0xe0, 0x8f, 0xe0,  // add lr, pc, lr
-    0x00, 0xf0, 0xbe, 0xe5   // ldr pc, [lr, #0]!
-};
-static const uint8_t ARMPlt0_d_AtomContent[4] = {
-    0x00, 0x00, 0x00, 0x00   // <got1_symbol_address>
-};
-
-// .plt values (other entries)
-static const uint8_t ARMPltAtomContent[12] = {
-    0x00, 0xc0, 0x8f, 0xe2,  // add ip, pc, #offset[G0]
-    0x00, 0xc0, 0x8c, 0xe2,  // add ip, ip, #offset[G1]
-    0x00, 0xf0, 0xbc, 0xe5   // ldr pc, [ip, #offset[G2]]!
-};
-
-// Veneer for switching from Thumb to ARM code for PLT entries.
-static const uint8_t ARMPltVeneerAtomContent[4] = {
-    0x78, 0x47,              // bx pc
-    0x00, 0x00               // nop
-};
-
-// Determine proper names for mapping symbols.
-static std::string getMappingAtomName(DefinedAtom::CodeModel model,
-                                      const std::string &part) {
-  switch (model) {
-  case DefinedAtom::codeARM_a:
-    return part.empty() ? "$a" : "$a." + part;
-  case DefinedAtom::codeARM_d:
-    return part.empty() ? "$d" : "$d." + part;
-  case DefinedAtom::codeARM_t:
-    return part.empty() ? "$t" : "$t." + part;
-  default:
-    llvm_unreachable("Wrong code model of mapping atom");
-  }
-}
-
-/// \brief Atoms that hold veneer code.
-class VeneerAtom : public SimpleELFDefinedAtom {
-  StringRef _section;
-
-public:
-  VeneerAtom(const File &f, StringRef secName, const std::string &name = "")
-      : SimpleELFDefinedAtom(f), _section(secName), _name(name) {}
-
-  Scope scope() const override { return DefinedAtom::scopeTranslationUnit; }
-
-  SectionChoice sectionChoice() const override {
-    return DefinedAtom::sectionBasedOnContent;
-  }
-
-  StringRef customSectionName() const override { return _section; }
-
-  ContentType contentType() const override { return DefinedAtom::typeCode; }
-
-  uint64_t size() const override { return rawContent().size(); }
-
-  ContentPermissions permissions() const override { return permR_X; }
-
-  Alignment alignment() const override { return 4; }
-
-  StringRef name() const override { return _name; }
-
-private:
-  std::string _name;
-};
-
-/// \brief Atoms that hold veneer for relocated ARM B/BL instructions
-/// in absolute code.
-class Veneer_ARM_B_BL_Abs_a_Atom : public VeneerAtom {
-public:
-  Veneer_ARM_B_BL_Abs_a_Atom(const File &f, StringRef secName,
-                             const std::string &name)
-      : VeneerAtom(f, secName, name) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(Veneer_ARM_B_BL_Abs_a_AtomContent);
-  }
-};
-
-class Veneer_ARM_B_BL_Abs_d_Atom : public VeneerAtom {
-public:
-  Veneer_ARM_B_BL_Abs_d_Atom(const File &f, StringRef secName)
-      : VeneerAtom(f, secName) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(Veneer_ARM_B_BL_Abs_d_AtomContent);
-  }
-};
-
-/// \brief Atoms that hold veneer for relocated Thumb B/BL instructions
-/// in absolute code.
-class Veneer_THM_B_BL_Abs_t_Atom : public VeneerAtom {
-public:
-  Veneer_THM_B_BL_Abs_t_Atom(const File &f, StringRef secName,
-                             const std::string &name)
-      : VeneerAtom(f, secName, name) {}
-
-  DefinedAtom::CodeModel codeModel() const override {
-    return DefinedAtom::codeARMThumb;
-  }
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(Veneer_THM_B_BL_Abs_t_AtomContent);
-  }
-};
-
-class Veneer_THM_B_BL_Abs_a_Atom : public VeneerAtom {
-public:
-  Veneer_THM_B_BL_Abs_a_Atom(const File &f, StringRef secName)
-      : VeneerAtom(f, secName) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(Veneer_THM_B_BL_Abs_a_AtomContent);
-  }
-};
-
-template <DefinedAtom::CodeModel Model>
-class ARMVeneerMappingAtom : public VeneerAtom {
-public:
-  ARMVeneerMappingAtom(const File &f, StringRef secName, StringRef name)
-      : VeneerAtom(f, secName, getMappingAtomName(Model, name)) {
-    static_assert((Model == DefinedAtom::codeARM_a ||
-                   Model == DefinedAtom::codeARM_d ||
-                   Model == DefinedAtom::codeARM_t),
-                  "Only mapping atom types are allowed");
-  }
-
-  uint64_t size() const override { return 0; }
-
-  ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
-
-  DefinedAtom::CodeModel codeModel() const override { return Model; }
-};
-
-template <class BaseAtom, DefinedAtom::CodeModel Model>
-class BaseMappingAtom : public BaseAtom {
-public:
-  BaseMappingAtom(const File &f, StringRef secName, StringRef name)
-      : BaseAtom(f, secName) {
-    static_assert((Model == DefinedAtom::codeARM_a ||
-                   Model == DefinedAtom::codeARM_d ||
-                   Model == DefinedAtom::codeARM_t),
-                  "Only mapping atom types are allowed");
-#ifndef NDEBUG
-    _name = name;
-#else
-    _name = getMappingAtomName(Model, name);
-#endif
-  }
-
-  DefinedAtom::CodeModel codeModel() const override {
-#ifndef NDEBUG
-    return isThumbCode(Model) ? DefinedAtom::codeARMThumb : DefinedAtom::codeNA;
-#else
-    return Model;
-#endif
-  }
-
-  StringRef name() const override { return _name; }
-
-private:
-  std::string _name;
-};
-
-/// \brief Atoms that are used by ARM dynamic linking
-class ARMGOTAtom : public GOTAtom {
-public:
-  ARMGOTAtom(const File &f) : GOTAtom(f, ".got") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(ARMGotAtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-
-protected:
-  // Constructor for PLTGOT atom.
-  ARMGOTAtom(const File &f, StringRef secName) : GOTAtom(f, secName) {}
-};
-
-class ARMGOTPLTAtom : public ARMGOTAtom {
-public:
-  ARMGOTPLTAtom(const File &f) : ARMGOTAtom(f, ".got.plt") {}
-};
-
-/// \brief Proxy class to keep type compatibility with PLT0Atom.
-class ARMPLT0Atom : public PLT0Atom {
-public:
-  ARMPLT0Atom(const File &f, StringRef) : PLT0Atom(f) {}
-};
-
-/// \brief PLT0 entry atom.
-/// Serves as a mapping symbol in the release mode.
-class ARMPLT0_a_Atom
-    : public BaseMappingAtom<ARMPLT0Atom, DefinedAtom::codeARM_a> {
-public:
-  ARMPLT0_a_Atom(const File &f, const std::string &name)
-      : BaseMappingAtom(f, ".plt", name) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(ARMPlt0_a_AtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-class ARMPLT0_d_Atom
-    : public BaseMappingAtom<ARMPLT0Atom, DefinedAtom::codeARM_d> {
-public:
-  ARMPLT0_d_Atom(const File &f, const std::string &name)
-      : BaseMappingAtom(f, ".plt", name) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(ARMPlt0_d_AtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-/// \brief PLT entry atom.
-/// Serves as a mapping symbol in the release mode.
-class ARMPLTAtom : public BaseMappingAtom<PLTAtom, DefinedAtom::codeARM_a> {
-public:
-  ARMPLTAtom(const File &f, const std::string &name)
-      : BaseMappingAtom(f, ".plt", name) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(ARMPltAtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-/// \brief Veneer atom for PLT entry.
-/// Serves as a mapping symbol in the release mode.
-class ARMPLTVeneerAtom
-    : public BaseMappingAtom<PLTAtom, DefinedAtom::codeARM_t> {
-public:
-  ARMPLTVeneerAtom(const File &f, const std::string &name)
-      : BaseMappingAtom(f, ".plt", name) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return llvm::makeArrayRef(ARMPltVeneerAtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-/// \brief Atom which represents an object for which a COPY relocation will
-/// be generated.
-class ARMObjectAtom : public ObjectAtom {
-public:
-  ARMObjectAtom(const File &f) : ObjectAtom(f) {}
-  Alignment alignment() const override { return 4; }
-};
-
-class ELFPassFile : public SimpleFile {
-public:
-  ELFPassFile(const ELFLinkingContext &eti) : SimpleFile("ELFPassFile") {
-    setOrdinal(eti.getNextOrdinalAndIncrement());
-  }
-
-  llvm::BumpPtrAllocator _alloc;
-};
-
-/// \brief CRTP base for handling relocations.
-template <class Derived> class ARMRelocationPass : public Pass {
-  /// \brief Handle a specific reference.
-  void handleReference(const DefinedAtom &atom, const Reference &ref) {
-    DEBUG_WITH_TYPE(
-        "ARM", llvm::dbgs() << "\t" << LLVM_FUNCTION_NAME << "()"
-            << ":   Name of Defined Atom: " << atom.name().str();
-        llvm::dbgs() << "   kindValue: " << ref.kindValue() << "\n");
-    if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-      return;
-    assert(ref.kindArch() == Reference::KindArch::ARM);
-    switch (ref.kindValue()) {
-    case R_ARM_ABS32:
-    case R_ARM_REL32:
-    case R_ARM_TARGET1:
-    case R_ARM_MOVW_ABS_NC:
-    case R_ARM_MOVT_ABS:
-    case R_ARM_THM_MOVW_ABS_NC:
-    case R_ARM_THM_MOVT_ABS:
-      static_cast<Derived *>(this)->handlePlain(isThumbCode(&atom), ref);
-      break;
-    case R_ARM_THM_CALL:
-    case R_ARM_CALL:
-    case R_ARM_JUMP24:
-    case R_ARM_THM_JUMP24:
-    case R_ARM_THM_JUMP11: {
-      const auto actualModel = actualSourceCodeModel(atom, ref);
-      const bool fromThumb = isThumbCode(actualModel);
-      static_cast<Derived *>(this)->handlePlain(fromThumb, ref);
-      static_cast<Derived *>(this)->handleVeneer(atom, fromThumb, ref);
-    } break;
-    case R_ARM_TLS_IE32:
-      static_cast<Derived *>(this)->handleTLSIE32(ref);
-      break;
-    case R_ARM_GOT_BREL:
-      static_cast<Derived *>(this)->handleGOT(ref);
-      break;
-    default:
-      break;
-    }
-  }
-
-protected:
-  /// \brief Determine source atom's actual code model.
-  ///
-  /// Actual code model may differ from the existing one if fixup
-  /// is possible on the later stages for given relocation type.
-  DefinedAtom::CodeModel actualSourceCodeModel(const DefinedAtom &atom,
-                                               const Reference &ref) {
-    const auto kindValue = ref.kindValue();
-    if (kindValue != R_ARM_CALL && kindValue != R_ARM_THM_CALL)
-      return atom.codeModel();
-
-    // TODO: For unconditional jump instructions (R_ARM_CALL and R_ARM_THM_CALL)
-    // fixup isn't possible without veneer generation for archs below ARMv5.
-
-    auto actualModel = atom.codeModel();
-    if (const auto *da = dyn_cast<DefinedAtom>(ref.target())) {
-      actualModel = da->codeModel();
-    } else if (const auto *sla = dyn_cast<SharedLibraryAtom>(ref.target())) {
-      if (sla->type() == SharedLibraryAtom::Type::Code) {
-        // PLT entry will be generated here - assume we don't want a veneer
-        // on top of it and prefer instruction fixup if needed.
-        actualModel = DefinedAtom::codeNA;
-      }
-    }
-    return actualModel;
-  }
-
-  std::error_code handleVeneer(const DefinedAtom &atom, bool fromThumb,
-                               const Reference &ref) {
-    // Actual instruction mode differs meaning that further fixup will be
-    // applied.
-    if (isThumbCode(&atom) != fromThumb)
-      return std::error_code();
-
-    const VeneerAtom *(Derived::*getVeneer)(const DefinedAtom *, StringRef) =
-        nullptr;
-    const auto kindValue = ref.kindValue();
-    switch (kindValue) {
-    case R_ARM_JUMP24:
-      getVeneer = &Derived::getVeneer_ARM_B_BL;
-      break;
-    case R_ARM_THM_JUMP24:
-      getVeneer = &Derived::getVeneer_THM_B_BL;
-      break;
-    default:
-      return std::error_code();
-    }
-
-    // Target symbol and relocated place should have different
-    // instruction sets in order a veneer to be generated in between.
-    const auto *target = dyn_cast<DefinedAtom>(ref.target());
-    if (!target || isThumbCode(target) == isThumbCode(&atom))
-      return std::error_code();
-
-    // Veneers may only be generated for STT_FUNC target symbols
-    // or for symbols located in sections different to the place of relocation.
-    StringRef secName = atom.customSectionName();
-    if (DefinedAtom::typeCode != target->contentType() &&
-        !target->customSectionName().equals(secName)) {
-      StringRef kindValStr;
-      if (!this->_ctx.registry().referenceKindToString(
-              ref.kindNamespace(), ref.kindArch(), kindValue, kindValStr)) {
-        kindValStr = "unknown";
-      }
-
-      std::string errStr =
-          (Twine("Reference of type ") + Twine(kindValue) + " (" + kindValStr +
-           ") from " + atom.name() + "+" + Twine(ref.offsetInAtom()) + " to " +
-           ref.target()->name() + "+" + Twine(ref.addend()) +
-           " cannot be effected without a veneer").str();
-
-      llvm_unreachable(errStr.c_str());
-    }
-
-    assert(getVeneer && "The veneer handler is missing");
-    const Atom *veneer =
-        (static_cast<Derived *>(this)->*getVeneer)(target, secName);
-
-    assert(veneer && "The veneer is not set");
-    const_cast<Reference &>(ref).setTarget(veneer);
-    return std::error_code();
-  }
-
-  /// \brief Get the veneer for ARM B/BL instructions
-  /// in absolute code.
-  const VeneerAtom *getVeneer_ARM_B_BL_Abs(const DefinedAtom *da,
-                                           StringRef secName) {
-    auto veneer = _veneerAtoms.lookup(da);
-    if (!veneer.empty())
-      return veneer._veneer;
-
-    std::string name = "__";
-    name += da->name();
-    name += "_from_arm";
-    // Create parts of veneer with mapping symbols.
-    auto v_a =
-        new (_file._alloc) Veneer_ARM_B_BL_Abs_a_Atom(_file, secName, name);
-    addVeneerWithMapping<DefinedAtom::codeARM_a>(da, v_a, name);
-    auto v_d = new (_file._alloc) Veneer_ARM_B_BL_Abs_d_Atom(_file, secName);
-    addVeneerWithMapping<DefinedAtom::codeARM_d>(v_a, v_d, name);
-
-    // Fake reference to show connection between parts of veneer.
-    v_a->addReferenceELF_ARM(R_ARM_NONE, 0, v_d, 0);
-    // Real reference to fixup.
-    v_d->addReferenceELF_ARM(R_ARM_ABS32, 0, da, 0);
-    return v_a;
-  }
-
-  /// \brief Get the veneer for Thumb B/BL instructions
-  /// in absolute code.
-  const VeneerAtom *getVeneer_THM_B_BL_Abs(const DefinedAtom *da,
-                                           StringRef secName) {
-    auto veneer = _veneerAtoms.lookup(da);
-    if (!veneer.empty())
-      return veneer._veneer;
-
-    std::string name = "__";
-    name += da->name();
-    name += "_from_thumb";
-    // Create parts of veneer with mapping symbols.
-    auto v_t =
-        new (_file._alloc) Veneer_THM_B_BL_Abs_t_Atom(_file, secName, name);
-    addVeneerWithMapping<DefinedAtom::codeARM_t>(da, v_t, name);
-    auto v_a = new (_file._alloc) Veneer_THM_B_BL_Abs_a_Atom(_file, secName);
-    addVeneerWithMapping<DefinedAtom::codeARM_a>(v_t, v_a, name);
-
-    // Fake reference to show connection between parts of veneer.
-    v_t->addReferenceELF_ARM(R_ARM_NONE, 0, v_a, 0);
-    // Real reference to fixup.
-    v_a->addReferenceELF_ARM(R_ARM_JUMP24, 0, da, 0);
-    return v_t;
-  }
-
-  std::error_code handleTLSIE32(const Reference &ref) {
-    if (const auto *target = dyn_cast<DefinedAtom>(ref.target())) {
-      const_cast<Reference &>(ref)
-          .setTarget(static_cast<Derived *>(this)->getTLSTPOFF32(target));
-      return std::error_code();
-    }
-    llvm_unreachable("R_ARM_TLS_IE32 reloc targets wrong atom type");
-  }
-
-  /// \brief Create a GOT entry for TLS with reloc type and addend specified.
-  template <Reference::KindValue R_ARM_TLS, Reference::Addend A = 0>
-  const GOTAtom *getGOTTLSEntry(const DefinedAtom *da) {
-    StringRef source;
-#ifndef NDEBUG
-    source = "_tls_";
-#endif
-    return getGOT<R_ARM_TLS, A>(da, source);
-  }
-
-  /// \brief Add veneer with mapping symbol.
-  template <DefinedAtom::CodeModel Model>
-  void addVeneerWithMapping(const DefinedAtom *da, VeneerAtom *va,
-                            const std::string &name) {
-    assert(_veneerAtoms.lookup(da).empty() &&
-           "Veneer or mapping already exists");
-    auto *ma = new (_file._alloc)
-        ARMVeneerMappingAtom<Model>(_file, va->customSectionName(), name);
-
-    // Fake reference to show connection between the mapping symbol and veneer.
-    va->addReferenceELF_ARM(R_ARM_NONE, 0, ma, 0);
-    _veneerAtoms[da] = VeneerWithMapping(va, ma);
-  }
-
-  /// \brief get a veneer for a PLT entry.
-  const PLTAtom *getPLTVeneer(const Atom *da, PLTAtom *pa, StringRef source) {
-    std::string name = "__plt_from_thumb";
-    name += source.empty() ? "_" : source;
-    name += da->name();
-    // Create veneer for PLT entry.
-    auto va = new (_file._alloc) ARMPLTVeneerAtom(_file, name);
-    // Fake reference to show connection between veneer and PLT entry.
-    va->addReferenceELF_ARM(R_ARM_NONE, 0, pa, 0);
-
-    _pltAtoms[da] = PLTWithVeneer(pa, va);
-    return va;
-  }
-
-  typedef const GOTAtom *(Derived::*GOTFactory)(const Atom *);
-
-  /// \brief get a PLT entry referencing PLTGOT entry.
-  ///
-  /// If the entry does not exist, both GOT and PLT entry are created.
-  const PLTAtom *getPLT(const Atom *da, bool fromThumb, GOTFactory gotFactory,
-                        StringRef source = "") {
-    auto pltVeneer = _pltAtoms.lookup(da);
-    if (!pltVeneer.empty()) {
-      // Return clean PLT entry provided it is ARM code.
-      if (!fromThumb)
-        return pltVeneer._plt;
-
-      // Check if veneer is present for Thumb to ARM transition.
-      if (pltVeneer._veneer)
-        return pltVeneer._veneer;
-
-      // Create veneer for existing PLT entry.
-      return getPLTVeneer(da, pltVeneer._plt, source);
-    }
-
-    // Create specific GOT entry.
-    const auto *ga = (static_cast<Derived *>(this)->*gotFactory)(da);
-    assert(_gotpltAtoms.lookup(da) == ga &&
-           "GOT entry should be added to the PLTGOT map");
-    assert(ga->customSectionName() == ".got.plt" &&
-           "GOT entry should be in a special section");
-
-    std::string name = "__plt";
-    name += source.empty() ? "_" : source;
-    name += da->name();
-    // Create PLT entry for the GOT entry.
-    auto pa = new (_file._alloc) ARMPLTAtom(_file, name);
-    pa->addReferenceELF_ARM(R_ARM_ALU_PC_G0_NC, 0, ga, -8);
-    pa->addReferenceELF_ARM(R_ARM_ALU_PC_G1_NC, 4, ga, -4);
-    pa->addReferenceELF_ARM(R_ARM_LDR_PC_G2, 8, ga, 0);
-
-    // Since all PLT entries are in ARM code, Thumb to ARM
-    // switching should be added if the relocated place contais Thumb code.
-    if (fromThumb)
-      return getPLTVeneer(da, pa, source);
-
-    // Otherwise just add PLT entry and return it to the caller.
-    _pltAtoms[da] = PLTWithVeneer(pa);
-    return pa;
-  }
-
-  /// \brief Create the GOT entry for a given IFUNC Atom.
-  const GOTAtom *createIFUNCGOT(const Atom *da) {
-    assert(!_gotpltAtoms.lookup(da) && "IFUNC GOT entry already exists");
-    auto g = new (_file._alloc) ARMGOTPLTAtom(_file);
-    g->addReferenceELF_ARM(R_ARM_ABS32, 0, da, 0);
-    g->addReferenceELF_ARM(R_ARM_IRELATIVE, 0, da, 0);
-#ifndef NDEBUG
-    g->_name = "__got_ifunc_";
-    g->_name += da->name();
-#endif
-    _gotpltAtoms[da] = g;
-    return g;
-  }
-
-  /// \brief get the PLT entry for a given IFUNC Atom.
-  const PLTAtom *getIFUNCPLTEntry(const DefinedAtom *da, bool fromThumb) {
-    return getPLT(da, fromThumb, &Derived::createIFUNCGOT, "_ifunc_");
-  }
-
-  /// \brief Redirect the call to the PLT stub for the target IFUNC.
-  ///
-  /// This create a PLT and GOT entry for the IFUNC if one does not exist. The
-  /// GOT entry and a IRELATIVE relocation to the original target resolver.
-  std::error_code handleIFUNC(bool fromThumb, const Reference &ref) {
-    auto target = dyn_cast<const DefinedAtom>(ref.target());
-    if (target && target->contentType() == DefinedAtom::typeResolver) {
-      const_cast<Reference &>(ref)
-          .setTarget(getIFUNCPLTEntry(target, fromThumb));
-    }
-    return std::error_code();
-  }
-
-  /// \brief Create a GOT entry containing 0.
-  const GOTAtom *getNullGOT() {
-    if (!_null) {
-      _null = new (_file._alloc) ARMGOTPLTAtom(_file);
-#ifndef NDEBUG
-      _null->_name = "__got_null";
-#endif
-    }
-    return _null;
-  }
-
-  /// \brief Create regular GOT entry which cannot be used in PLTGOT operation.
-  template <Reference::KindValue R_ARM_REL, Reference::Addend A = 0>
-  const GOTAtom *getGOT(const Atom *da, StringRef source = "") {
-    if (auto got = _gotAtoms.lookup(da))
-      return got;
-    auto g = new (_file._alloc) ARMGOTAtom(_file);
-    g->addReferenceELF_ARM(R_ARM_REL, 0, da, A);
-#ifndef NDEBUG
-    g->_name = "__got";
-    g->_name += source.empty() ? "_" : source;
-    g->_name += da->name();
-#endif
-    _gotAtoms[da] = g;
-    return g;
-  }
-
-  /// \brief get GOT entry for a regular defined atom.
-  const GOTAtom *getGOTEntry(const DefinedAtom *da) {
-    return getGOT<R_ARM_ABS32>(da);
-  }
-
-  std::error_code handleGOT(const Reference &ref) {
-    if (isa<UndefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getNullGOT());
-    else if (const auto *da = dyn_cast<DefinedAtom>(ref.target()))
-      const_cast<Reference &>(ref).setTarget(getGOTEntry(da));
-    return std::error_code();
-  }
-
-public:
-  ARMRelocationPass(const ELFLinkingContext &ctx) : _file(ctx), _ctx(ctx) {}
-
-  /// \brief Do the pass.
-  ///
-  /// The goal here is to first process each reference individually. Each call
-  /// to handleReference may modify the reference itself and/or create new
-  /// atoms which must be stored in one of the maps below.
-  ///
-  /// After all references are handled, the atoms created during that are all
-  /// added to mf.
-  std::error_code perform(SimpleFile &mf) override {
-    ScopedTask task(getDefaultDomain(), "ARM GOT/PLT Pass");
-    DEBUG_WITH_TYPE(
-        "ARM", llvm::dbgs() << "Undefined Atoms" << "\n";
-        for (const auto &atom
-             : mf.undefined()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        }
-
-        llvm::dbgs() << "Shared Library Atoms" << "\n";
-        for (const auto &atom
-             : mf.sharedLibrary()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        }
-
-        llvm::dbgs() << "Absolute Atoms" << "\n";
-        for (const auto &atom
-             : mf.absolute()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        }
-
-        llvm::dbgs() << "Defined Atoms" << "\n";
-        for (const auto &atom
-             : mf.defined()) {
-          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
-        });
-
-    // Process all references.
-    for (const auto &atom : mf.defined()) {
-      for (const auto &ref : *atom) {
-        handleReference(*atom, *ref);
-      }
-    }
-
-    // Add all created atoms to the link.
-    uint64_t ordinal = 0;
-    if (_plt0) {
-      _plt0->setOrdinal(ordinal++);
-      mf.addAtom(*_plt0);
-      _plt0_d->setOrdinal(ordinal++);
-      mf.addAtom(*_plt0_d);
-    }
-    for (auto &pltKV : _pltAtoms) {
-      auto &plt = pltKV.second;
-      if (auto *v = plt._veneer) {
-        v->setOrdinal(ordinal++);
-        mf.addAtom(*v);
-      }
-      auto *p = plt._plt;
-      p->setOrdinal(ordinal++);
-      mf.addAtom(*p);
-    }
-    if (_null) {
-      _null->setOrdinal(ordinal++);
-      mf.addAtom(*_null);
-    }
-    if (_plt0) {
-      _got0->setOrdinal(ordinal++);
-      mf.addAtom(*_got0);
-      _got1->setOrdinal(ordinal++);
-      mf.addAtom(*_got1);
-    }
-    for (auto &gotKV : _gotAtoms) {
-      auto &got = gotKV.second;
-      got->setOrdinal(ordinal++);
-      mf.addAtom(*got);
-    }
-    for (auto &gotKV : _gotpltAtoms) {
-      auto &got = gotKV.second;
-      got->setOrdinal(ordinal++);
-      mf.addAtom(*got);
-    }
-    for (auto &objectKV : _objectAtoms) {
-      auto &obj = objectKV.second;
-      obj->setOrdinal(ordinal++);
-      mf.addAtom(*obj);
-    }
-    for (auto &veneerKV : _veneerAtoms) {
-      auto &veneer = veneerKV.second;
-      auto *m = veneer._mapping;
-      m->setOrdinal(ordinal++);
-      mf.addAtom(*m);
-      auto *v = veneer._veneer;
-      v->setOrdinal(ordinal++);
-      mf.addAtom(*v);
-    }
-
-    return std::error_code();
-  }
-
-protected:
-  /// \brief Owner of all the Atoms created by this pass.
-  ELFPassFile _file;
-  const ELFLinkingContext &_ctx;
-
-  /// \brief Map Atoms to their GOT entries.
-  llvm::MapVector<const Atom *, GOTAtom *> _gotAtoms;
-
-  /// \brief Map Atoms to their PLTGOT entries.
-  llvm::MapVector<const Atom *, GOTAtom *> _gotpltAtoms;
-
-  /// \brief Map Atoms to their Object entries.
-  llvm::MapVector<const Atom *, ObjectAtom *> _objectAtoms;
-
-  /// \brief Map Atoms to their PLT entries depending on the code model.
-  struct PLTWithVeneer {
-    PLTWithVeneer(PLTAtom *p = nullptr, PLTAtom *v = nullptr)
-        : _plt(p), _veneer(v) {}
-
-    bool empty() const {
-      assert((_plt || !_veneer) && "Veneer appears without PLT entry");
-      return !_plt && !_veneer;
-    }
-
-    PLTAtom *_plt;
-    PLTAtom *_veneer;
-  };
-  llvm::MapVector<const Atom *, PLTWithVeneer> _pltAtoms;
-
-  /// \brief Map Atoms to their veneers.
-  struct VeneerWithMapping {
-    VeneerWithMapping(VeneerAtom *v = nullptr, VeneerAtom *m = nullptr)
-        : _veneer(v), _mapping(m) {}
-
-    bool empty() const {
-      assert(((bool)_veneer == (bool)_mapping) &&
-             "Mapping symbol should always be paired with veneer");
-      return !_veneer && !_mapping;
-    }
-
-    VeneerAtom *_veneer;
-    VeneerAtom *_mapping;
-  };
-  llvm::MapVector<const Atom *, VeneerWithMapping> _veneerAtoms;
-
-  /// \brief GOT entry that is always 0. Used for undefined weaks.
-  GOTAtom *_null = nullptr;
-
-  /// \brief The got and plt entries for .PLT0. This is used to call into the
-  /// dynamic linker for symbol resolution.
-  /// @{
-  PLT0Atom *_plt0 = nullptr;
-  PLT0Atom *_plt0_d = nullptr;
-  GOTAtom *_got0 = nullptr;
-  GOTAtom *_got1 = nullptr;
-  /// @}
-};
-
-/// This implements the static relocation model. Meaning GOT and PLT entries are
-/// not created for references that can be directly resolved. These are
-/// converted to a direct relocation. For entries that do require a GOT or PLT
-/// entry, that entry is statically bound.
-///
-/// TLS always assumes module 1 and attempts to remove indirection.
-class ARMStaticRelocationPass final
-    : public ARMRelocationPass<ARMStaticRelocationPass> {
-public:
-  ARMStaticRelocationPass(const elf::ARMLinkingContext &ctx)
-      : ARMRelocationPass(ctx) {}
-
-  /// \brief Handle ordinary relocation references.
-  std::error_code handlePlain(bool fromThumb, const Reference &ref) {
-    return handleIFUNC(fromThumb, ref);
-  }
-
-  /// \brief Get the veneer for ARM B/BL instructions.
-  const VeneerAtom *getVeneer_ARM_B_BL(const DefinedAtom *da,
-                                       StringRef secName) {
-    return getVeneer_ARM_B_BL_Abs(da, secName);
-  }
-
-  /// \brief Get the veneer for Thumb B/BL instructions.
-  const VeneerAtom *getVeneer_THM_B_BL(const DefinedAtom *da,
-                                       StringRef secName) {
-    return getVeneer_THM_B_BL_Abs(da, secName);
-  }
-
-  /// \brief Create a GOT entry for R_ARM_TLS_TPOFF32 reloc.
-  const GOTAtom *getTLSTPOFF32(const DefinedAtom *da) {
-    return getGOTTLSEntry<R_ARM_TLS_LE32>(da);
-  }
-};
-
-/// This implements the dynamic relocation model. GOT and PLT entries are
-/// created for references that cannot be directly resolved.
-class ARMDynamicRelocationPass final
-    : public ARMRelocationPass<ARMDynamicRelocationPass> {
-public:
-  ARMDynamicRelocationPass(const elf::ARMLinkingContext &ctx)
-      : ARMRelocationPass(ctx) {}
-
-  /// \brief get the PLT entry for a given atom.
-  const PLTAtom *getPLTEntry(const SharedLibraryAtom *sla, bool fromThumb) {
-    return getPLT(sla, fromThumb, &ARMDynamicRelocationPass::createPLTGOT);
-  }
-
-  /// \brief Create the GOT entry for a given atom.
-  const GOTAtom *createPLTGOT(const Atom *da) {
-    assert(!_gotpltAtoms.lookup(da) && "PLTGOT entry already exists");
-    auto g = new (_file._alloc) ARMGOTPLTAtom(_file);
-    g->addReferenceELF_ARM(R_ARM_ABS32, 0, getPLT0(), 0);
-    g->addReferenceELF_ARM(R_ARM_JUMP_SLOT, 0, da, 0);
-#ifndef NDEBUG
-    g->_name = "__got_plt0_";
-    g->_name += da->name();
-#endif
-    _gotpltAtoms[da] = g;
-    return g;
-  }
-
-  const ObjectAtom *getObjectEntry(const SharedLibraryAtom *a) {
-    if (auto obj = _objectAtoms.lookup(a))
-      return obj;
-
-    auto oa = new (_file._alloc) ARMObjectAtom(_file);
-    oa->addReferenceELF_ARM(R_ARM_COPY, 0, oa, 0);
-
-    oa->_name = a->name();
-    oa->_size = a->size();
-
-    _objectAtoms[a] = oa;
-    return oa;
-  }
-
-  /// \brief Handle ordinary relocation references.
-  std::error_code handlePlain(bool fromThumb, const Reference &ref) {
-    if (auto sla = dyn_cast<SharedLibraryAtom>(ref.target())) {
-      if (sla->type() == SharedLibraryAtom::Type::Data &&
-          _ctx.getOutputELFType() == llvm::ELF::ET_EXEC) {
-        const_cast<Reference &>(ref).setTarget(getObjectEntry(sla));
-      } else if (sla->type() == SharedLibraryAtom::Type::Code) {
-        const_cast<Reference &>(ref).setTarget(getPLTEntry(sla, fromThumb));
-      }
-      return std::error_code();
-    }
-    return handleIFUNC(fromThumb, ref);
-  }
-
-  /// \brief Get the veneer for ARM B/BL instructions.
-  const VeneerAtom *getVeneer_ARM_B_BL(const DefinedAtom *da,
-                                       StringRef secName) {
-    if (_ctx.getOutputELFType() == llvm::ELF::ET_EXEC) {
-      return getVeneer_ARM_B_BL_Abs(da, secName);
-    }
-    llvm_unreachable("Handle ARM veneer for DSOs");
-  }
-
-  /// \brief Get the veneer for Thumb B/BL instructions.
-  const VeneerAtom *getVeneer_THM_B_BL(const DefinedAtom *da,
-                                       StringRef secName) {
-    if (_ctx.getOutputELFType() == llvm::ELF::ET_EXEC) {
-      return getVeneer_THM_B_BL_Abs(da, secName);
-    }
-    llvm_unreachable("Handle Thumb veneer for DSOs");
-  }
-
-  /// \brief Create a GOT entry for R_ARM_TLS_TPOFF32 reloc.
-  const GOTAtom *getTLSTPOFF32(const DefinedAtom *da) {
-    return getGOTTLSEntry<R_ARM_TLS_TPOFF32>(da);
-  }
-
-  const PLT0Atom *getPLT0() {
-    if (_plt0)
-      return _plt0;
-    // Fill in the null entry.
-    getNullGOT();
-    _plt0 = new (_file._alloc) ARMPLT0_a_Atom(_file, "__PLT0");
-    _plt0_d = new (_file._alloc) ARMPLT0_d_Atom(_file, "__PLT0_d");
-    _got0 = new (_file._alloc) ARMGOTPLTAtom(_file);
-    _got1 = new (_file._alloc) ARMGOTPLTAtom(_file);
-    _plt0_d->addReferenceELF_ARM(R_ARM_REL32, 0, _got1, 0);
-    // Fake reference to show connection between the GOT and PLT entries.
-    _plt0->addReferenceELF_ARM(R_ARM_NONE, 0, _got0, 0);
-    // Fake reference to show connection between parts of PLT entry.
-    _plt0->addReferenceELF_ARM(R_ARM_NONE, 0, _plt0_d, 0);
-#ifndef NDEBUG
-    _got0->_name = "__got0";
-    _got1->_name = "__got1";
-#endif
-    return _plt0;
-  }
-
-  const GOTAtom *getSharedGOTEntry(const SharedLibraryAtom *sla) {
-    return getGOT<R_ARM_GLOB_DAT>(sla);
-  }
-
-  std::error_code handleGOT(const Reference &ref) {
-    if (const auto sla = dyn_cast<const SharedLibraryAtom>(ref.target())) {
-      const_cast<Reference &>(ref).setTarget(getSharedGOTEntry(sla));
-      return std::error_code();
-    }
-    return ARMRelocationPass::handleGOT(ref);
-  }
-};
-
-} // end of anon namespace
-
-std::unique_ptr<Pass>
-lld::elf::createARMRelocationPass(const ARMLinkingContext &ctx) {
-  switch (ctx.getOutputELFType()) {
-  case llvm::ELF::ET_EXEC:
-    if (ctx.isDynamic())
-      return llvm::make_unique<ARMDynamicRelocationPass>(ctx);
-    return llvm::make_unique<ARMStaticRelocationPass>(ctx);
-  case llvm::ELF::ET_DYN:
-    return llvm::make_unique<ARMDynamicRelocationPass>(ctx);
-  default:
-    llvm_unreachable("Unhandled output file type");
-  }
-}
diff --git a/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h b/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h
deleted file mode 100644
index 651e798f33b1..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h ---------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief Declares the relocation processing pass for ARM. This includes
-///   GOT and PLT entries, TLS, COPY, and ifunc.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_PASS_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_PASS_H
-
-#include <memory>
-
-namespace lld {
-class Pass;
-namespace elf {
-class ARMLinkingContext;
-
-/// \brief Create ARM relocation pass for the given linking context.
-std::unique_ptr<Pass> createARMRelocationPass(const ARMLinkingContext &);
-}
-}
-
-#endif
diff --git a/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h b/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h
deleted file mode 100644
index 85b9c9162589..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMSymbolTable.h ------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_SYMBOL_TABLE_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_SYMBOL_TABLE_H
-
-#include "SectionChunks.h"
-#include "TargetLayout.h"
-#include "ARMELFFile.h"
-
-namespace lld {
-namespace elf {
-
-/// \brief The SymbolTable class represents the symbol table in a ELF file
-class ARMSymbolTable : public SymbolTable<ELF32LE> {
-public:
-  typedef llvm::object::Elf_Sym_Impl<ELF32LE> Elf_Sym;
-
-  ARMSymbolTable(const ELFLinkingContext &ctx);
-
-  void addDefinedAtom(Elf_Sym &sym, const DefinedAtom *da,
-                      int64_t addr) override;
-};
-
-ARMSymbolTable::ARMSymbolTable(const ELFLinkingContext &ctx)
-    : SymbolTable(ctx, ".symtab", TargetLayout<ELF32LE>::ORDER_SYMBOL_TABLE) {}
-
-void ARMSymbolTable::addDefinedAtom(Elf_Sym &sym, const DefinedAtom *da,
-                                    int64_t addr) {
-  SymbolTable::addDefinedAtom(sym, da, addr);
-
-  if ((ARMELFDefinedAtom::ARMContentType)da->contentType() ==
-      ARMELFDefinedAtom::typeARMExidx)
-    sym.st_value = addr;
-
-  // Set zero bit to distinguish real symbols addressing Thumb instructions.
-  // Don't care about mapping symbols like $t and others.
-  if (DefinedAtom::codeARMThumb == da->codeModel())
-    sym.st_value = static_cast<int64_t>(sym.st_value) | 0x1;
-
-  // Mapping symbols should have special values of binding, type and size set.
-  if ((DefinedAtom::codeARM_a == da->codeModel()) ||
-      (DefinedAtom::codeARM_d == da->codeModel()) ||
-      (DefinedAtom::codeARM_t == da->codeModel())) {
-    sym.setBindingAndType(llvm::ELF::STB_LOCAL, llvm::ELF::STT_NOTYPE);
-    sym.st_size = 0;
-  }
-}
-
-} // elf
-} // lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_SYMBOL_TABLE_H
diff --git a/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp b/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp
deleted file mode 100644
index e1f5eadbe789..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp --------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Atoms.h"
-#include "ARMExecutableWriter.h"
-#include "ARMDynamicLibraryWriter.h"
-#include "ARMTargetHandler.h"
-#include "ARMLinkingContext.h"
-
-using namespace lld;
-using namespace elf;
-
-ARMTargetHandler::ARMTargetHandler(ARMLinkingContext &ctx)
-    : _ctx(ctx), _targetLayout(new ARMTargetLayout(ctx)),
-      _relocationHandler(new ARMTargetRelocationHandler(*_targetLayout)) {}
-
-std::unique_ptr<Writer> ARMTargetHandler::getWriter() {
-  switch (this->_ctx.getOutputELFType()) {
-  case llvm::ELF::ET_EXEC:
-    return llvm::make_unique<ARMExecutableWriter>(_ctx, *_targetLayout);
-  case llvm::ELF::ET_DYN:
-    return llvm::make_unique<ARMDynamicLibraryWriter>(_ctx, *_targetLayout);
-  default:
-    llvm_unreachable("unsupported output type");
-  }
-}
diff --git a/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h b/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
deleted file mode 100644
index 0352e81a1f61..000000000000
--- a/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
+++ /dev/null
@@ -1,174 +0,0 @@
-//===--------- lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h ----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ARM_ARM_TARGET_HANDLER_H
-#define LLD_READER_WRITER_ELF_ARM_ARM_TARGET_HANDLER_H
-
-#include "ARMELFFile.h"
-#include "ARMRelocationHandler.h"
-#include "ELFReader.h"
-#include "TargetLayout.h"
-
-namespace lld {
-class ELFLinkingContext;
-
-namespace elf {
-
-/// \brief ARM specific section (.ARM.exidx) with indexes to exception handlers
-class ARMExidxSection : public AtomSection<ELF32LE> {
-  typedef AtomSection<ELF32LE> Base;
-
-public:
-  ARMExidxSection(const ELFLinkingContext &ctx, StringRef sectionName,
-                  int32_t permissions, int32_t order)
-      : Base(ctx, sectionName, ARMELFDefinedAtom::typeARMExidx, permissions,
-             order) {
-    this->_type = SHT_ARM_EXIDX;
-    this->_isLoadedInMemory = true;
-  }
-
-  bool hasOutputSegment() const override { return true; }
-
-  const AtomLayout *appendAtom(const Atom *atom) override {
-    const DefinedAtom *definedAtom = cast<DefinedAtom>(atom);
-    assert((ARMELFDefinedAtom::ARMContentType)definedAtom->contentType() ==
-               ARMELFDefinedAtom::typeARMExidx &&
-           "atom content type for .ARM.exidx section has to be typeARMExidx");
-
-    DefinedAtom::Alignment atomAlign = definedAtom->alignment();
-    uint64_t fOffset = alignOffset(this->fileSize(), atomAlign);
-    uint64_t mOffset = alignOffset(this->memSize(), atomAlign);
-
-    _atoms.push_back(new (_alloc) AtomLayout(atom, fOffset, 0));
-    this->_fsize = fOffset + definedAtom->size();
-    this->_msize = mOffset + definedAtom->size();
-    DEBUG_WITH_TYPE("Section", llvm::dbgs()
-                                   << "[" << this->name() << " " << this << "] "
-                                   << "Adding atom: " << atom->name() << "@"
-                                   << fOffset << "\n");
-
-    uint64_t alignment = atomAlign.value;
-    if (this->_alignment < alignment)
-      this->_alignment = alignment;
-
-    return _atoms.back();
-  }
-};
-
-class ARMTargetLayout : public TargetLayout<ELF32LE> {
-public:
-  enum ARMSectionOrder {
-    ORDER_ARM_EXIDX = TargetLayout::ORDER_EH_FRAME + 1,
-  };
-
-  ARMTargetLayout(ELFLinkingContext &ctx) : TargetLayout(ctx) {}
-
-  SectionOrder getSectionOrder(StringRef name, int32_t contentType,
-                               int32_t contentPermissions) override {
-    switch (contentType) {
-    case ARMELFDefinedAtom::typeARMExidx:
-      return ORDER_ARM_EXIDX;
-    default:
-      return TargetLayout::getSectionOrder(name, contentType,
-                                           contentPermissions);
-    }
-  }
-
-  StringRef getOutputSectionName(StringRef archivePath, StringRef memberPath,
-                                 StringRef inputSectionName) const override {
-    return llvm::StringSwitch<StringRef>(inputSectionName)
-        .StartsWith(".ARM.exidx", ".ARM.exidx")
-        .StartsWith(".ARM.extab", ".ARM.extab")
-        .Default(TargetLayout::getOutputSectionName(archivePath, memberPath,
-                                                    inputSectionName));
-  }
-
-  SegmentType getSegmentType(const Section<ELF32LE> *section) const override {
-    switch (section->order()) {
-    case ORDER_ARM_EXIDX:
-      return llvm::ELF::PT_ARM_EXIDX;
-    default:
-      return TargetLayout::getSegmentType(section);
-    }
-  }
-
-  AtomSection<ELF32LE> *
-  createSection(StringRef name, int32_t contentType,
-                DefinedAtom::ContentPermissions contentPermissions,
-                SectionOrder sectionOrder) override {
-    if ((ARMELFDefinedAtom::ARMContentType)contentType ==
-        ARMELFDefinedAtom::typeARMExidx)
-      return new ARMExidxSection(_ctx, name, contentPermissions, sectionOrder);
-
-    return TargetLayout::createSection(name, contentType, contentPermissions,
-                                       sectionOrder);
-  }
-
-  uint64_t getGOTSymAddr() {
-    std::call_once(_gotSymOnce, [this]() {
-      if (AtomLayout *gotAtom = findAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"))
-        _gotSymAddr = gotAtom->_virtualAddr;
-    });
-    return _gotSymAddr;
-  }
-
-  uint64_t getTPOffset() {
-    std::call_once(_tpOffOnce, [this]() {
-      for (const auto &phdr : *_programHeader) {
-        if (phdr->p_type == llvm::ELF::PT_TLS) {
-          _tpOff = llvm::RoundUpToAlignment(TCB_SIZE, phdr->p_align);
-          break;
-        }
-      }
-      assert(_tpOff != 0 && "TLS segment not found");
-    });
-    return _tpOff;
-  }
-
-  bool target1Rel() const { return _ctx.armTarget1Rel(); }
-
-private:
-  // TCB block size of the TLS.
-  enum { TCB_SIZE = 0x8 };
-
-private:
-  uint64_t _gotSymAddr = 0;
-  uint64_t _tpOff = 0;
-  std::once_flag _gotSymOnce;
-  std::once_flag _tpOffOnce;
-};
-
-class ARMTargetHandler final : public TargetHandler {
-public:
-  ARMTargetHandler(ARMLinkingContext &ctx);
-
-  const TargetRelocationHandler &getRelocationHandler() const override {
-    return *_relocationHandler;
-  }
-
-  std::unique_ptr<Reader> getObjReader() override {
-    return llvm::make_unique<ELFReader<ARMELFFile>>(_ctx);
-  }
-
-  std::unique_ptr<Reader> getDSOReader() override {
-    return llvm::make_unique<ELFReader<DynamicFile<ELF32LE>>>(_ctx);
-  }
-
-  std::unique_ptr<Writer> getWriter() override;
-
-private:
-  ARMLinkingContext &_ctx;
-  std::unique_ptr<ARMTargetLayout> _targetLayout;
-  std::unique_ptr<ARMTargetRelocationHandler> _relocationHandler;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ARM_ARM_TARGET_HANDLER_H
diff --git a/lib/ReaderWriter/ELF/ARM/CMakeLists.txt b/lib/ReaderWriter/ELF/ARM/CMakeLists.txt
deleted file mode 100644
index c8cd6533d902..000000000000
--- a/lib/ReaderWriter/ELF/ARM/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_lld_library(lldARMELFTarget
-  ARMLinkingContext.cpp
-  ARMTargetHandler.cpp
-  ARMRelocationHandler.cpp
-  ARMRelocationPass.cpp
-  LINK_LIBS
-    lldELF
-    lldReaderWriter
-    lldCore
-    LLVMObject
-    LLVMSupport
-  )
diff --git a/lib/ReaderWriter/ELF/ARM/TODO.rst b/lib/ReaderWriter/ELF/ARM/TODO.rst
deleted file mode 100644
index 61b585ae698c..000000000000
--- a/lib/ReaderWriter/ELF/ARM/TODO.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-ELF ARM
-~~~~~~~~~~~
-
-Unimplemented Features
-######################
-
-* DSO linking
-* C++ code linking
-* PLT entries' generation for images larger than 2^28 bytes (see Sec. A.3 of the ARM ELF reference)
-* ARM/Thumb interwork veneers in position-independent code
-* .ARM.exidx section (exception handling)
-* -init/-fini options
-* Proper debug information (DWARF data)
-* TLS relocations for dynamic models
-* Lots of other relocations
-
-Unimplemented Relocations
-#########################
-
-All of these relocations are defined in:
-http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044e/IHI0044E_aaelf.pdf
diff --git a/lib/ReaderWriter/ELF/Atoms.cpp b/lib/ReaderWriter/ELF/Atoms.cpp
deleted file mode 100644
index 639633393161..000000000000
--- a/lib/ReaderWriter/ELF/Atoms.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-//===- lib/ReaderWriter/ELF/Atoms.cpp -------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Atoms.h"
-#include "DynamicFile.h"
-#include "ELFFile.h"
-#include "TargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> AbsoluteAtom::Scope ELFAbsoluteAtom<ELFT>::scope() const {
-  if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
-    return scopeLinkageUnit;
-  if (_symbol->getBinding() == llvm::ELF::STB_LOCAL)
-    return scopeTranslationUnit;
-  return scopeGlobal;
-}
-
-template <class ELFT>
-UndefinedAtom::CanBeNull ELFUndefinedAtom<ELFT>::canBeNull() const {
-  if (_symbol->getBinding() == llvm::ELF::STB_WEAK)
-    return CanBeNull::canBeNullAtBuildtime;
-  return CanBeNull::canBeNullNever;
-}
-
-template <class ELFT> uint64_t ELFDefinedAtom<ELFT>::size() const {
-  // Common symbols are not allocated in object files,
-  // so use st_size to tell how many bytes are required.
-  if (_symbol && (_symbol->getType() == llvm::ELF::STT_COMMON ||
-                  _symbol->st_shndx == llvm::ELF::SHN_COMMON))
-    return (uint64_t)_symbol->st_size;
-
-  return _contentData.size();
-}
-
-template <class ELFT> AbsoluteAtom::Scope ELFDefinedAtom<ELFT>::scope() const {
-  if (!_symbol)
-    return scopeGlobal;
-  if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
-    return scopeLinkageUnit;
-  if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
-    return scopeGlobal;
-  return scopeTranslationUnit;
-}
-
-template <class ELFT> DefinedAtom::Merge ELFDefinedAtom<ELFT>::merge() const {
-  if (!_symbol)
-    return mergeNo;
-  if (_symbol->getBinding() == llvm::ELF::STB_WEAK)
-    return mergeAsWeak;
-  if (_symbol->getType() == llvm::ELF::STT_COMMON ||
-      _symbol->st_shndx == llvm::ELF::SHN_COMMON)
-    return mergeAsTentative;
-  return mergeNo;
-}
-
-template <class ELFT>
-DefinedAtom::ContentType ELFDefinedAtom<ELFT>::doContentType() const {
-  using namespace llvm::ELF;
-
-  if (_section->sh_type == SHT_GROUP)
-    return typeGroupComdat;
-  if (!_symbol && _sectionName.startswith(".gnu.linkonce"))
-    return typeGnuLinkOnce;
-
-  uint64_t flags = _section->sh_flags;
-
-  if (!(flags & SHF_ALLOC)) {
-    if (_section->sh_type == SHT_NOTE)
-      return (flags == SHF_WRITE) ? typeRWNote : typeRONote;
-    return _contentType = typeNoAlloc;
-  }
-
-  if (_section->sh_flags == (SHF_ALLOC | SHF_WRITE | SHF_TLS))
-    return _section->sh_type == SHT_NOBITS ? typeThreadZeroFill
-                                           : typeThreadData;
-
-  if (_section->sh_flags == SHF_ALLOC && _section->sh_type == SHT_PROGBITS)
-    return _contentType = typeConstant;
-  if (_symbol->getType() == STT_GNU_IFUNC)
-    return _contentType = typeResolver;
-  if (_symbol->st_shndx == SHN_COMMON)
-    return _contentType = typeZeroFill;
-
-  if (_section->sh_type == SHT_PROGBITS) {
-    flags &= ~SHF_ALLOC;
-    flags &= ~SHF_GROUP;
-    if ((flags & SHF_STRINGS) || (flags & SHF_MERGE))
-      return typeConstant;
-    if (flags == SHF_WRITE)
-      return typeData;
-    return typeCode;
-  }
-  if (_section->sh_type == SHT_NOTE) {
-    flags &= ~SHF_ALLOC;
-    return (flags == SHF_WRITE) ? typeRWNote : typeRONote;
-  }
-  if (_section->sh_type == SHT_NOBITS)
-    return typeZeroFill;
-
-  if (_section->sh_type == SHT_NULL)
-    if (_symbol->getType() == STT_COMMON || _symbol->st_shndx == SHN_COMMON)
-      return typeZeroFill;
-
-  if (_section->sh_type == SHT_INIT_ARRAY ||
-      _section->sh_type == SHT_FINI_ARRAY)
-    return typeData;
-  return typeUnknown;
-}
-
-template <class ELFT>
-DefinedAtom::ContentType ELFDefinedAtom<ELFT>::contentType() const {
-  if (_contentType != typeUnknown)
-    return _contentType;
-  _contentType = doContentType();
-  return _contentType;
-}
-
-template <class ELFT>
-DefinedAtom::Alignment ELFDefinedAtom<ELFT>::alignment() const {
-  if (!_symbol)
-    return 1;
-
-  // Obtain proper value of st_value field.
-  const auto symValue = getSymbolValue();
-
-  // Unallocated common symbols specify their alignment constraints in
-  // st_value.
-  if ((_symbol->getType() == llvm::ELF::STT_COMMON) ||
-      _symbol->st_shndx == llvm::ELF::SHN_COMMON) {
-    return symValue;
-  }
-  if (_section->sh_addralign == 0) {
-    // sh_addralign of 0 means no alignment
-    return Alignment(1, symValue);
-  }
-  return Alignment(_section->sh_addralign, symValue % _section->sh_addralign);
-}
-
-// Do we have a choice for ELF?  All symbols live in explicit sections.
-template <class ELFT>
-DefinedAtom::SectionChoice ELFDefinedAtom<ELFT>::sectionChoice() const {
-  switch (contentType()) {
-  case typeCode:
-  case typeData:
-  case typeZeroFill:
-  case typeThreadZeroFill:
-  case typeThreadData:
-  case typeConstant:
-    if ((_sectionName == ".text") || (_sectionName == ".data") ||
-        (_sectionName == ".bss") || (_sectionName == ".rodata") ||
-        (_sectionName == ".tdata") || (_sectionName == ".tbss"))
-      return sectionBasedOnContent;
-  default:
-    break;
-  }
-  return sectionCustomRequired;
-}
-
-template <class ELFT>
-StringRef ELFDefinedAtom<ELFT>::customSectionName() const {
-  if ((contentType() == typeZeroFill) ||
-      (_symbol && _symbol->st_shndx == llvm::ELF::SHN_COMMON))
-    return ".bss";
-  return _sectionName;
-}
-
-template <class ELFT>
-DefinedAtom::ContentPermissions ELFDefinedAtom<ELFT>::permissions() const {
-  if (_permissions != permUnknown)
-    return _permissions;
-
-  uint64_t flags = _section->sh_flags;
-
-  if (!(flags & llvm::ELF::SHF_ALLOC))
-    return _permissions = perm___;
-
-  switch (_section->sh_type) {
-  // permRW_L is for sections modified by the runtime
-  // loader.
-  case llvm::ELF::SHT_REL:
-  case llvm::ELF::SHT_RELA:
-    return _permissions = permRW_L;
-
-  case llvm::ELF::SHT_DYNAMIC:
-  case llvm::ELF::SHT_PROGBITS:
-  case llvm::ELF::SHT_NOTE:
-    flags &= ~llvm::ELF::SHF_ALLOC;
-    flags &= ~llvm::ELF::SHF_GROUP;
-    switch (flags) {
-    // Code
-    case llvm::ELF::SHF_EXECINSTR:
-      return _permissions = permR_X;
-    case (llvm::ELF::SHF_WRITE | llvm::ELF::SHF_EXECINSTR):
-      return _permissions = permRWX;
-    // Data
-    case llvm::ELF::SHF_WRITE:
-      return _permissions = permRW_;
-    // Strings
-    case llvm::ELF::SHF_MERGE:
-    case llvm::ELF::SHF_STRINGS:
-      return _permissions = permR__;
-
-    default:
-      if (flags & llvm::ELF::SHF_WRITE)
-        return _permissions = permRW_;
-      return _permissions = permR__;
-    }
-
-  case llvm::ELF::SHT_NOBITS:
-    return _permissions = permRW_;
-
-  case llvm::ELF::SHT_INIT_ARRAY:
-  case llvm::ELF::SHT_FINI_ARRAY:
-    return _permissions = permRW_;
-
-  default:
-    return _permissions = perm___;
-  }
-}
-
-template <class ELFT>
-DefinedAtom::reference_iterator ELFDefinedAtom<ELFT>::begin() const {
-  uintptr_t index = _referenceStartIndex;
-  const void *it = reinterpret_cast<const void *>(index);
-  return reference_iterator(*this, it);
-}
-
-template <class ELFT>
-DefinedAtom::reference_iterator ELFDefinedAtom<ELFT>::end() const {
-  uintptr_t index = _referenceEndIndex;
-  const void *it = reinterpret_cast<const void *>(index);
-  return reference_iterator(*this, it);
-}
-
-template <class ELFT>
-const Reference *ELFDefinedAtom<ELFT>::derefIterator(const void *It) const {
-  uintptr_t index = reinterpret_cast<uintptr_t>(It);
-  assert(index >= _referenceStartIndex);
-  assert(index < _referenceEndIndex);
-  return ((_referenceList)[index]);
-}
-
-template <class ELFT>
-void ELFDefinedAtom<ELFT>::incrementIterator(const void *&It) const {
-  uintptr_t index = reinterpret_cast<uintptr_t>(It);
-  ++index;
-  It = reinterpret_cast<const void *>(index);
-}
-
-template <class ELFT>
-void ELFDefinedAtom<ELFT>::addReference(ELFReference<ELFT> *reference) {
-  _referenceList.push_back(reference);
-  _referenceEndIndex = _referenceList.size();
-}
-
-template <class ELFT> AbsoluteAtom::Scope ELFDynamicAtom<ELFT>::scope() const {
-  if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
-    return scopeLinkageUnit;
-  if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
-    return scopeGlobal;
-  return scopeTranslationUnit;
-}
-
-template <class ELFT>
-SharedLibraryAtom::Type ELFDynamicAtom<ELFT>::type() const {
-  switch (_symbol->getType()) {
-  case llvm::ELF::STT_FUNC:
-  case llvm::ELF::STT_GNU_IFUNC:
-    return Type::Code;
-  case llvm::ELF::STT_OBJECT:
-    return Type::Data;
-  default:
-    return Type::Unknown;
-  }
-}
-
-#define INSTANTIATE(klass)        \
-  template class klass<ELF32LE>;  \
-  template class klass<ELF32BE>;  \
-  template class klass<ELF64LE>;  \
-  template class klass<ELF64BE>
-
-INSTANTIATE(ELFAbsoluteAtom);
-INSTANTIATE(ELFDefinedAtom);
-INSTANTIATE(ELFDynamicAtom);
-INSTANTIATE(ELFUndefinedAtom);
-
-} // end namespace elf
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/Atoms.h b/lib/ReaderWriter/ELF/Atoms.h
deleted file mode 100644
index 390c0e16baf8..000000000000
--- a/lib/ReaderWriter/ELF/Atoms.h
+++ /dev/null
@@ -1,493 +0,0 @@
-//===- lib/ReaderWriter/ELF/Atoms.h ---------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_ATOMS_H
-#define LLD_READER_WRITER_ELF_ATOMS_H
-
-#include "TargetHandler.h"
-#include "lld/Core/LLVM.h"
-#include "lld/Core/Simple.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringSwitch.h"
-#include <memory>
-#include <vector>
-
-namespace lld {
-namespace elf {
-template <class ELFT> class DynamicFile;
-template <typename ELFT> class ELFFile;
-
-/// \brief Relocation References: Defined Atoms may contain references that will
-/// need to be patched before the executable is written.
-///
-/// Construction of ELFReferences is two pass process. ELFReferences are
-/// instantiated while we are iterating over symbol tables to atomize
-/// symbols. At that time we only know the index of relocation target symbol
-/// (not target atom) about a relocation, so we store the index to
-/// ELFREference. In the second pass, ELFReferences are revisited to update
-/// target atoms by target symbol indexes.
-template <class ELFT> class ELFReference : public Reference {
-  typedef llvm::object::Elf_Rel_Impl<ELFT, false> Elf_Rel;
-  typedef llvm::object::Elf_Rel_Impl<ELFT, true> Elf_Rela;
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-
-public:
-  ELFReference(const Elf_Rela *rela, uint64_t off, Reference::KindArch arch,
-               Reference::KindValue relocType, uint32_t idx)
-      : Reference(Reference::KindNamespace::ELF, arch, relocType),
-        _targetSymbolIndex(idx), _offsetInAtom(off), _addend(rela->r_addend) {}
-
-  ELFReference(uint64_t off, Reference::KindArch arch,
-               Reference::KindValue relocType, uint32_t idx)
-      : Reference(Reference::KindNamespace::ELF, arch, relocType),
-        _targetSymbolIndex(idx), _offsetInAtom(off) {}
-
-  ELFReference(uint32_t edgeKind)
-      : Reference(Reference::KindNamespace::all, Reference::KindArch::all,
-                  edgeKind) {}
-
-  uint64_t offsetInAtom() const override { return _offsetInAtom; }
-
-  const Atom *target() const override { return _target; }
-
-  /// \brief The symbol table index that contains the target reference.
-  uint64_t targetSymbolIndex() const {
-    return _targetSymbolIndex;
-  }
-
-  Addend addend() const override { return _addend; }
-
-  virtual void setOffset(uint64_t off) { _offsetInAtom = off; }
-
-  void setAddend(Addend A) override { _addend = A; }
-
-  void setTarget(const Atom *newAtom) override { _target = newAtom; }
-
-private:
-  const Atom *_target = nullptr;
-  uint64_t _targetSymbolIndex = 0;
-  uint64_t _offsetInAtom = 0;
-  Addend _addend = 0;
-};
-
-/// \brief These atoms store symbols that are fixed to a particular address.
-/// This atom has no content its address will be used by the writer to fixup
-/// references that point to it.
-template <class ELFT> class ELFAbsoluteAtom : public AbsoluteAtom {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-
-public:
-  ELFAbsoluteAtom(const ELFFile<ELFT> &file, StringRef name,
-                  const Elf_Sym *symbol, uint64_t value)
-      : _owningFile(file), _name(name), _symbol(symbol), _value(value) {}
-
-  const ELFFile<ELFT> &file() const override { return _owningFile; }
-  Scope scope() const override;
-  StringRef name() const override { return _name; }
-  uint64_t value() const override { return _value; }
-
-private:
-  const ELFFile<ELFT> &_owningFile;
-  StringRef _name;
-  const Elf_Sym *_symbol;
-  uint64_t _value;
-};
-
-/// \brief ELFUndefinedAtom: These atoms store undefined symbols and are place
-/// holders that will be replaced by defined atoms later in the linking process.
-template <class ELFT> class ELFUndefinedAtom : public UndefinedAtom {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-
-public:
-  ELFUndefinedAtom(const File &file, StringRef name, const Elf_Sym *symbol)
-      : _owningFile(file), _name(name), _symbol(symbol) {}
-
-  const File &file() const override { return _owningFile; }
-  StringRef name() const override { return _name; }
-
-  // A symbol in ELF can be undefined at build time if the symbol is a undefined
-  // weak symbol.
-  CanBeNull canBeNull() const override;
-
-private:
-  const File &_owningFile;
-  StringRef _name;
-  const Elf_Sym *_symbol;
-};
-
-/// \brief This atom stores defined symbols and will contain either data or
-/// code.
-template <class ELFT> class ELFDefinedAtom : public DefinedAtom {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-
-public:
-  ELFDefinedAtom(const ELFFile<ELFT> &file, StringRef symbolName,
-                 StringRef sectionName, const Elf_Sym *symbol,
-                 const Elf_Shdr *section, ArrayRef<uint8_t> contentData,
-                 unsigned int referenceStart, unsigned int referenceEnd,
-                 std::vector<ELFReference<ELFT> *> &referenceList)
-      : _owningFile(file), _symbolName(symbolName), _sectionName(sectionName),
-        _symbol(symbol), _section(section), _contentData(contentData),
-        _referenceStartIndex(referenceStart), _referenceEndIndex(referenceEnd),
-        _referenceList(referenceList), _contentType(typeUnknown),
-        _permissions(permUnknown) {}
-
-  ~ELFDefinedAtom() override = default;
-
-  const ELFFile<ELFT> &file() const override { return _owningFile; }
-  StringRef name() const override { return _symbolName; }
-  uint64_t ordinal() const override { return _ordinal; }
-  const Elf_Sym *symbol() const { return _symbol; }
-  const Elf_Shdr *section() const { return _section; }
-  uint64_t size() const override;
-  Scope scope() const override;
-
-  // FIXME: Need to revisit this in future.
-  Interposable interposable() const override { return interposeNo; }
-
-  Merge merge() const override;
-  ContentType contentType() const override;
-  Alignment alignment() const override;
-  SectionChoice sectionChoice() const override;
-  StringRef customSectionName() const override;
-
-  // It isn't clear that __attribute__((used)) is transmitted to the ELF object
-  // file.
-  DeadStripKind deadStrip() const override { return deadStripNormal; }
-
-  ContentPermissions permissions() const override;
-  ArrayRef<uint8_t> rawContent() const override { return _contentData; }
-
-  DefinedAtom::reference_iterator begin() const override;
-  DefinedAtom::reference_iterator end() const override;
-  const Reference *derefIterator(const void *It) const override;
-  void incrementIterator(const void *&It) const override;
-  void addReference(ELFReference<ELFT> *reference);
-
-  virtual void setOrdinal(uint64_t ord) { _ordinal = ord; }
-
-protected:
-  /// Returns correct st_value for the symbol depending on the architecture.
-  /// For most architectures it's just a regular st_value with no changes.
-  virtual uint64_t getSymbolValue() const {
-    return _symbol->st_value;
-  }
-
-  ContentType doContentType() const;
-
-  const ELFFile<ELFT> &_owningFile;
-  StringRef _symbolName;
-  StringRef _sectionName;
-  const Elf_Sym *_symbol;
-  const Elf_Shdr *_section;
-  /// \brief Holds the bits that make up the atom.
-  ArrayRef<uint8_t> _contentData;
-
-  uint64_t _ordinal;
-  unsigned int _referenceStartIndex;
-  unsigned int _referenceEndIndex;
-  std::vector<ELFReference<ELFT> *> &_referenceList;
-  mutable ContentType _contentType;
-  mutable ContentPermissions _permissions;
-};
-
-/// \brief This atom stores mergeable Strings
-template <class ELFT> class ELFMergeAtom : public DefinedAtom {
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-
-public:
-  ELFMergeAtom(const ELFFile<ELFT> &file, StringRef sectionName,
-               const Elf_Shdr *section, ArrayRef<uint8_t> contentData,
-               uint64_t offset)
-      : _owningFile(file), _sectionName(sectionName), _section(section),
-        _contentData(contentData), _offset(offset) {
-  }
-
-  const ELFFile<ELFT> &file() const override { return _owningFile; }
-  StringRef name() const override { return ""; }
-  virtual uint64_t section() const { return _section->sh_name; }
-  virtual uint64_t offset() const { return _offset; }
-  virtual void setOrdinal(uint64_t ord) { _ordinal = ord; }
-  uint64_t ordinal() const override { return _ordinal; }
-  uint64_t size() const override { return _contentData.size(); }
-  Scope scope() const override { return scopeTranslationUnit; }
-  Interposable interposable() const override { return interposeNo; }
-  Merge merge() const override { return mergeByContent; }
-  ContentType contentType() const override { return typeConstant; }
-
-  Alignment alignment() const override {
-    return Alignment(_section->sh_addralign);
-  }
-
-  SectionChoice sectionChoice() const override { return sectionCustomRequired; }
-  StringRef customSectionName() const override { return _sectionName; }
-  DeadStripKind deadStrip() const override { return deadStripNormal; }
-  ContentPermissions permissions() const override { return permR__; }
-  ArrayRef<uint8_t> rawContent() const override { return _contentData; }
-
-  DefinedAtom::reference_iterator begin() const override {
-    uintptr_t index = 0;
-    const void *it = reinterpret_cast<const void *>(index);
-    return reference_iterator(*this, it);
-  }
-
-  DefinedAtom::reference_iterator end() const override {
-    uintptr_t index = 0;
-    const void *it = reinterpret_cast<const void *>(index);
-    return reference_iterator(*this, it);
-  }
-
-  const Reference *derefIterator(const void *It) const override {
-    return nullptr;
-  }
-
-  void incrementIterator(const void *&It) const override {}
-
-private:
-  const ELFFile<ELFT> &_owningFile;
-  StringRef _sectionName;
-  const Elf_Shdr *_section;
-  /// \brief Holds the bits that make up the atom.
-  ArrayRef<uint8_t> _contentData;
-  uint64_t _ordinal;
-  uint64_t _offset;
-};
-
-template <class ELFT> class ELFCommonAtom : public DefinedAtom {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-public:
-  ELFCommonAtom(const ELFFile<ELFT> &file, StringRef symbolName,
-                const Elf_Sym *symbol)
-      : _owningFile(file), _symbolName(symbolName), _symbol(symbol) {}
-
-  const ELFFile<ELFT> &file() const override { return _owningFile; }
-  StringRef name() const override { return _symbolName; }
-  uint64_t ordinal() const override { return _ordinal; }
-  virtual void setOrdinal(uint64_t ord) { _ordinal = ord; }
-  uint64_t size() const override { return _symbol->st_size; }
-
-  Scope scope() const override {
-    if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
-      return scopeLinkageUnit;
-    if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
-      return scopeGlobal;
-    return scopeTranslationUnit;
-  }
-
-  Interposable interposable() const override { return interposeNo; }
-  Merge merge() const override { return mergeAsTentative; }
-  ContentType contentType() const override { return typeZeroFill; }
-  Alignment alignment() const override { return Alignment(_symbol->st_value); }
-  SectionChoice sectionChoice() const override { return sectionBasedOnContent; }
-  StringRef customSectionName() const override { return ".bss"; }
-  DeadStripKind deadStrip() const override { return deadStripNormal; }
-  ContentPermissions permissions() const override { return permRW_; }
-  ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
-
-  DefinedAtom::reference_iterator begin() const override {
-    uintptr_t index = 0;
-    const void *it = reinterpret_cast<const void *>(index);
-    return reference_iterator(*this, it);
-  }
-
-  DefinedAtom::reference_iterator end() const override {
-    uintptr_t index = 0;
-    const void *it = reinterpret_cast<const void *>(index);
-    return reference_iterator(*this, it);
-  }
-
-protected:
-  const Reference *derefIterator(const void *iter) const override {
-    return nullptr;
-  }
-
-  void incrementIterator(const void *&iter) const override {}
-
-  const ELFFile<ELFT> &_owningFile;
-  StringRef _symbolName;
-  const Elf_Sym *_symbol;
-  uint64_t _ordinal;
-};
-
-/// \brief An atom from a shared library.
-template <class ELFT> class ELFDynamicAtom : public SharedLibraryAtom {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-
-public:
-  ELFDynamicAtom(const DynamicFile<ELFT> &file, StringRef symbolName,
-                 StringRef loadName, const Elf_Sym *symbol)
-      : _owningFile(file), _symbolName(symbolName), _loadName(loadName),
-        _symbol(symbol) {}
-
-  const DynamicFile<ELFT> &file() const override { return _owningFile; }
-  StringRef name() const override { return _symbolName; }
-  virtual Scope scope() const;
-  StringRef loadName() const override { return _loadName; }
-
-  bool canBeNullAtRuntime() const override {
-    return _symbol->getBinding() == llvm::ELF::STB_WEAK;
-  }
-
-  Type type() const override;
-  uint64_t size() const override { return _symbol->st_size; }
-
-private:
-
-  const DynamicFile<ELFT> &_owningFile;
-  StringRef _symbolName;
-  StringRef _loadName;
-  const Elf_Sym *_symbol;
-};
-
-class SimpleELFDefinedAtom : public SimpleDefinedAtom {
-public:
-  SimpleELFDefinedAtom(const File &f) : SimpleDefinedAtom(f) {}
-
-  void addReferenceELF(Reference::KindArch arch, Reference::KindValue kindValue,
-                       uint64_t off, const Atom *t, Reference::Addend a) {
-    addReference(Reference::KindNamespace::ELF, arch, kindValue, off, t, a);
-  }
-
-  void addReferenceELF_Hexagon(Reference::KindValue relocType, uint64_t off,
-                               const Atom *t, Reference::Addend a) {
-    addReferenceELF(Reference::KindArch::Hexagon, relocType, off, t, a);
-  }
-
-  void addReferenceELF_x86_64(Reference::KindValue relocType, uint64_t off,
-                              const Atom *t, Reference::Addend a) {
-    addReferenceELF(Reference::KindArch::x86_64, relocType, off, t, a);
-  }
-
-  void addReferenceELF_Mips(Reference::KindValue relocType, uint64_t off,
-                            const Atom *t, Reference::Addend a) {
-    addReferenceELF(Reference::KindArch::Mips, relocType, off, t, a);
-  }
-
-  void addReferenceELF_AArch64(Reference::KindValue relocType, uint64_t off,
-                               const Atom *t, Reference::Addend a) {
-    addReferenceELF(Reference::KindArch::AArch64, relocType, off, t, a);
-  }
-
-  void addReferenceELF_ARM(Reference::KindValue relocType, uint64_t off,
-                           const Atom *t, Reference::Addend a) {
-    addReferenceELF(Reference::KindArch::ARM, relocType, off, t, a);
-  }
-};
-
-/// \brief Atom which represents an object for which a COPY relocation will be
-///   generated.
-class ObjectAtom : public SimpleELFDefinedAtom {
-public:
-  ObjectAtom(const File &f) : SimpleELFDefinedAtom(f) {}
-  Scope scope() const override { return scopeGlobal; }
-  SectionChoice sectionChoice() const override { return sectionBasedOnContent; }
-  ContentType contentType() const override { return typeZeroFill; }
-  uint64_t size() const override { return _size; }
-  DynamicExport dynamicExport() const override { return dynamicExportAlways; }
-  ContentPermissions permissions() const override { return permRW_; }
-  ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
-  Alignment alignment() const override { return 8; }
-  StringRef name() const override { return _name; }
-
-  std::string _name;
-  uint64_t _size;
-};
-
-class GOTAtom : public SimpleELFDefinedAtom {
-  StringRef _section;
-
-public:
-  GOTAtom(const File &f, StringRef secName)
-      : SimpleELFDefinedAtom(f), _section(secName) {}
-
-  Scope scope() const override { return scopeTranslationUnit; }
-  SectionChoice sectionChoice() const override { return sectionCustomRequired; }
-  StringRef customSectionName() const override { return _section; }
-  ContentType contentType() const override { return typeGOT; }
-  uint64_t size() const override { return rawContent().size(); }
-  ContentPermissions permissions() const override { return permRW_; }
-  Alignment alignment() const override { return 8; }
-
-#ifndef NDEBUG
-  StringRef name() const override { return _name; }
-  std::string _name;
-#else
-  StringRef name() const override { return ""; }
-#endif
-};
-
-class PLTAtom : public SimpleELFDefinedAtom {
-  StringRef _section;
-
-public:
-  PLTAtom(const File &f, StringRef secName)
-      : SimpleELFDefinedAtom(f), _section(secName) {}
-
-  Scope scope() const override { return scopeTranslationUnit; }
-  SectionChoice sectionChoice() const override { return sectionCustomRequired; }
-  StringRef customSectionName() const override { return _section; }
-  ContentType contentType() const override { return typeStub; }
-  uint64_t size() const override { return rawContent().size(); }
-  ContentPermissions permissions() const override { return permR_X; }
-  Alignment alignment() const override { return 16; }
-
-#ifndef NDEBUG
-  StringRef name() const override { return _name; }
-  std::string _name;
-#else
-  StringRef name() const override { return ""; }
-#endif
-};
-
-class PLT0Atom : public PLTAtom {
-public:
-  PLT0Atom(const File &f) : PLTAtom(f, ".plt") {
-#ifndef NDEBUG
-    _name = ".PLT0";
-#endif
-  }
-};
-
-class GlobalOffsetTableAtom : public SimpleELFDefinedAtom {
-public:
-  GlobalOffsetTableAtom(const File &f) : SimpleELFDefinedAtom(f) {}
-
-  StringRef name() const override { return "_GLOBAL_OFFSET_TABLE_"; }
-  Scope scope() const override { return scopeLinkageUnit; }
-  SectionChoice sectionChoice() const override { return sectionCustomRequired; }
-  StringRef customSectionName() const override { return ".got.plt"; }
-  ContentType contentType() const override { return typeGOT; }
-  uint64_t size() const override { return 0; }
-  ContentPermissions permissions() const override { return permRW_; }
-  Alignment alignment() const override { return 8; }
-  ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
-};
-
-class DynamicAtom : public SimpleELFDefinedAtom {
-public:
-  DynamicAtom(const File &f) : SimpleELFDefinedAtom(f) {}
-
-  StringRef name() const override { return "_DYNAMIC"; }
-  Scope scope() const override { return scopeLinkageUnit; }
-  Merge merge() const override { return mergeNo; }
-  SectionChoice sectionChoice() const override { return sectionCustomRequired; }
-  StringRef customSectionName() const override { return ".dynamic"; }
-  ContentType contentType() const override { return typeData; }
-  uint64_t size() const override { return 0; }
-  ContentPermissions permissions() const override { return permRW_; }
-  Alignment alignment() const override { return 1; }
-  ArrayRef<uint8_t> rawContent() const override { return ArrayRef<uint8_t>(); }
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif // LLD_READER_WRITER_ELF_ATOMS_H
diff --git a/lib/ReaderWriter/ELF/CMakeLists.txt b/lib/ReaderWriter/ELF/CMakeLists.txt
deleted file mode 100644
index 3bc338507db6..000000000000
--- a/lib/ReaderWriter/ELF/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-add_lld_library(lldELF
-  Atoms.cpp
-  DynamicFile.cpp
-  ELFFile.cpp
-  ELFLinkingContext.cpp
-  FileCommon.cpp
-  HeaderChunks.cpp
-  OutputELFWriter.cpp
-  Reader.cpp
-  SectionChunks.cpp
-  SegmentChunks.cpp
-  TargetLayout.cpp
-  Writer.cpp
-  LINK_LIBS
-    lldReaderWriter
-    lldCore
-    lldYAML
-    LLVMObject
-    LLVMSupport
-  )
-
-include_directories(.)
-
-add_subdirectory(X86)
-add_subdirectory(X86_64)
-add_subdirectory(Mips)
-add_subdirectory(Hexagon)
-add_subdirectory(AArch64)
-add_subdirectory(ARM)
diff --git a/lib/ReaderWriter/ELF/Chunk.h b/lib/ReaderWriter/ELF/Chunk.h
deleted file mode 100644
index f223b6c54163..000000000000
--- a/lib/ReaderWriter/ELF/Chunk.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//===- lib/ReaderWriter/ELF/Chunks.h --------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_CHUNKS_H
-#define LLD_READER_WRITER_ELF_CHUNKS_H
-
-#include "lld/Core/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ELF.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include <memory>
-
-namespace lld {
-class ELFLinkingContext;
-
-namespace elf {
-class ELFWriter;
-template <class ELFT> class TargetLayout;
-
-/// \brief A chunk is a contiguous region of space
-template <class ELFT> class Chunk {
-public:
-  /// \brief Describes the type of Chunk
-  enum Kind : uint8_t {
-    ELFHeader,     ///< ELF Header
-    ProgramHeader, ///< Program Header
-    SectionHeader, ///< Section header
-    ELFSegment,    ///< Segment
-    ELFSection,    ///< Section
-    AtomSection,   ///< A section containing atoms
-    Expression     ///< A linker script expression
-  };
-
-  /// \brief the ContentType of the chunk
-  enum ContentType : uint8_t { Unknown, Header, Code, Data, Note, TLS };
-
-  Chunk(StringRef name, Kind kind, const ELFLinkingContext &ctx)
-      : _name(name), _kind(kind), _ctx(ctx) {}
-
-  virtual ~Chunk() {}
-
-  // The name of the chunk
-  StringRef name() const { return _name; }
-
-  // Kind of chunk
-  Kind kind() const { return _kind; }
-  virtual uint64_t fileSize() const { return _fsize; }
-  virtual void setFileSize(uint64_t sz) { _fsize = sz; }
-  virtual void setAlign(uint64_t align) { _alignment = align; }
-  virtual uint64_t alignment() const { return _alignment; }
-
-  // The ordinal value of the chunk
-  uint64_t ordinal() const { return _ordinal; }
-  void setOrdinal(uint64_t newVal) { _ordinal = newVal; }
-
-  // The order in which the chunk would appear in the output file
-  uint64_t order() const { return _order; }
-  void setOrder(uint32_t order) { _order = order; }
-
-  // Output file offset of the chunk
-  uint64_t fileOffset() const { return _fileoffset; }
-  void setFileOffset(uint64_t offset) { _fileoffset = offset; }
-
-  // Output start address of the chunk
-  virtual void setVirtualAddr(uint64_t start) { _start = start; }
-  virtual uint64_t virtualAddr() const { return _start; }
-
-  // Memory size of the chunk
-  uint64_t memSize() const { return _msize; }
-  void setMemSize(uint64_t msize) { _msize = msize; }
-
-  // Returns the ContentType of the chunk
-  virtual int getContentType() const = 0;
-
-  // Writer the chunk
-  virtual void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-                     llvm::FileOutputBuffer &buffer) = 0;
-
-  // Finalize the chunk before assigning offsets/virtual addresses
-  virtual void doPreFlight() {}
-
-  // Finalize the chunk before writing
-  virtual void finalize() {}
-
-protected:
-  StringRef _name;
-  Kind _kind;
-  const ELFLinkingContext &_ctx;
-  uint64_t _fsize = 0;
-  uint64_t _msize = 0;
-  uint64_t _alignment = 1;
-  uint32_t _order = 0;
-  uint64_t _ordinal = 1;
-  uint64_t _start = 0;
-  uint64_t _fileoffset = 0;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/DynamicFile.cpp b/lib/ReaderWriter/ELF/DynamicFile.cpp
deleted file mode 100644
index 5339c7d66577..000000000000
--- a/lib/ReaderWriter/ELF/DynamicFile.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//===- lib/ReaderWriter/ELF/DynamicFile.cpp -------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "DynamicFile.h"
-#include "FileCommon.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/Path.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT>
-DynamicFile<ELFT>::DynamicFile(std::unique_ptr<MemoryBuffer> mb,
-                               ELFLinkingContext &ctx)
-    : SharedLibraryFile(mb->getBufferIdentifier()), _mb(std::move(mb)),
-      _ctx(ctx), _useShlibUndefines(ctx.useShlibUndefines()) {}
-
-template <typename ELFT>
-std::error_code DynamicFile<ELFT>::isCompatible(MemoryBufferRef mb,
-                                                ELFLinkingContext &ctx) {
-  return elf::isCompatible<ELFT>(mb, ctx);
-}
-
-template <class ELFT>
-const SharedLibraryAtom *DynamicFile<ELFT>::exports(StringRef name,
-                                                    bool dataSymbolOnly) const {
-  assert(!dataSymbolOnly && "Invalid option for ELF exports!");
-  // See if we have the symbol.
-  auto sym = _nameToSym.find(name);
-  if (sym == _nameToSym.end())
-    return nullptr;
-  // Have we already created a SharedLibraryAtom for it?
-  if (sym->second._atom)
-    return sym->second._atom;
-  // Create a SharedLibraryAtom for this symbol.
-  return sym->second._atom = new (_alloc)
-             ELFDynamicAtom<ELFT>(*this, name, _soname, sym->second._symbol);
-}
-
-template <class ELFT> StringRef DynamicFile<ELFT>::getDSOName() const {
-  return _soname;
-}
-
-template <class ELFT> bool DynamicFile<ELFT>::canParse(file_magic magic) {
-  return magic == file_magic::elf_shared_object;
-}
-
-template <class ELFT> std::error_code DynamicFile<ELFT>::doParse() {
-  typedef llvm::object::ELFFile<ELFT> ELFO;
-  typedef typename ELFO::Elf_Shdr Elf_Shdr;
-  typedef typename ELFO::Elf_Dyn Elf_Dyn;
-
-  std::error_code ec;
-  _objFile.reset(new ELFO(_mb->getBuffer(), ec));
-  if (ec)
-    return ec;
-
-  ELFO &obj = *_objFile;
-
-  const char *base = _mb->getBuffer().data();
-  const Elf_Dyn *dynStart = nullptr;
-  const Elf_Dyn *dynEnd = nullptr;
-
-  const Elf_Shdr *dynSymSec = nullptr;
-  for (const Elf_Shdr &sec : obj.sections()) {
-    switch (sec.sh_type) {
-    case llvm::ELF::SHT_DYNAMIC: {
-      dynStart = reinterpret_cast<const Elf_Dyn *>(base + sec.sh_offset);
-      uint64_t size = sec.sh_size;
-      if (size % sizeof(Elf_Dyn))
-        return llvm::object::object_error::parse_failed;
-      dynEnd = dynStart + size / sizeof(Elf_Dyn);
-      break;
-    }
-    case llvm::ELF::SHT_DYNSYM:
-      dynSymSec = &sec;
-      break;
-    }
-  }
-
-  ErrorOr<StringRef> strTableOrErr = obj.getStringTableForSymtab(*dynSymSec);
-  if (std::error_code ec = strTableOrErr.getError())
-    return ec;
-  StringRef stringTable = *strTableOrErr;
-
-  for (const Elf_Dyn &dyn : llvm::make_range(dynStart, dynEnd)) {
-    if (dyn.d_tag == llvm::ELF::DT_SONAME) {
-      uint64_t offset = dyn.getVal();
-      if (offset >= stringTable.size())
-        return llvm::object::object_error::parse_failed;
-      _soname = StringRef(stringTable.data() + offset);
-      break;
-    }
-  }
-
-  if (_soname.empty())
-    _soname = llvm::sys::path::filename(path());
-
-  // Create a map from names to dynamic symbol table entries.
-  // TODO: This should use the object file's build in hash table instead if
-  // it exists.
-  for (auto i = obj.symbol_begin(dynSymSec), e = obj.symbol_end(dynSymSec);
-       i != e; ++i) {
-    auto name = i->getName(stringTable);
-    if ((ec = name.getError()))
-      return ec;
-
-    // Dont add local symbols to dynamic entries. The first symbol in the
-    // dynamic symbol table is a local symbol.
-    if (i->getBinding() == llvm::ELF::STB_LOCAL)
-      continue;
-
-    // TODO: Add absolute symbols
-    if (i->st_shndx == llvm::ELF::SHN_ABS)
-      continue;
-
-    if (i->st_shndx == llvm::ELF::SHN_UNDEF) {
-      if (!_useShlibUndefines)
-        continue;
-      // Create an undefined atom.
-      if (!name->empty()) {
-        auto *newAtom = new (_alloc) ELFUndefinedAtom<ELFT>(*this, *name, &*i);
-        _undefinedAtoms.push_back(newAtom);
-      }
-      continue;
-    }
-    _nameToSym[*name]._symbol = &*i;
-  }
-  return std::error_code();
-}
-
-template class DynamicFile<ELF32LE>;
-template class DynamicFile<ELF32BE>;
-template class DynamicFile<ELF64LE>;
-template class DynamicFile<ELF64BE>;
-
-} // end namespace elf
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/DynamicFile.h b/lib/ReaderWriter/ELF/DynamicFile.h
deleted file mode 100644
index a155900de781..000000000000
--- a/lib/ReaderWriter/ELF/DynamicFile.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//===- lib/ReaderWriter/ELF/DynamicFile.h ---------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_DYNAMIC_FILE_H
-#define LLD_READER_WRITER_ELF_DYNAMIC_FILE_H
-
-#include "Atoms.h"
-#include "lld/Core/SharedLibraryFile.h"
-#include <unordered_map>
-
-namespace lld {
-class ELFLinkingContext;
-
-namespace elf {
-
-template <class ELFT> class DynamicFile : public SharedLibraryFile {
-public:
-  DynamicFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx);
-
-  static std::error_code isCompatible(MemoryBufferRef mb,
-                                      ELFLinkingContext &ctx);
-
-  const SharedLibraryAtom *exports(StringRef name,
-                                   bool dataSymbolOnly) const override;
-
-  StringRef getDSOName() const override;
-
-  static bool canParse(file_magic magic);
-
-protected:
-  std::error_code doParse() override;
-
-private:
-  mutable llvm::BumpPtrAllocator _alloc;
-  std::unique_ptr<llvm::object::ELFFile<ELFT>> _objFile;
-  /// \brief DT_SONAME
-  StringRef _soname;
-
-  struct SymAtomPair {
-    const typename llvm::object::ELFFile<ELFT>::Elf_Sym *_symbol = nullptr;
-    const SharedLibraryAtom *_atom = nullptr;
-  };
-
-  std::unique_ptr<MemoryBuffer> _mb;
-  ELFLinkingContext &_ctx;
-  bool _useShlibUndefines;
-  mutable std::unordered_map<StringRef, SymAtomPair> _nameToSym;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/DynamicLibraryWriter.h b/lib/ReaderWriter/ELF/DynamicLibraryWriter.h
deleted file mode 100644
index 5f2c1d1a8288..000000000000
--- a/lib/ReaderWriter/ELF/DynamicLibraryWriter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//===- lib/ReaderWriter/ELF/DynamicLibraryWriter.h ------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_DYNAMIC_LIBRARY_WRITER_H
-#define LLD_READER_WRITER_ELF_DYNAMIC_LIBRARY_WRITER_H
-
-#include "OutputELFWriter.h"
-
-namespace lld {
-namespace elf {
-using namespace llvm;
-using namespace llvm::object;
-
-//===----------------------------------------------------------------------===//
-//  DynamicLibraryWriter Class
-//===----------------------------------------------------------------------===//
-template<class ELFT>
-class DynamicLibraryWriter : public OutputELFWriter<ELFT> {
-public:
-  DynamicLibraryWriter(ELFLinkingContext &ctx, TargetLayout<ELFT> &layout)
-      : OutputELFWriter<ELFT>(ctx, layout) {}
-
-protected:
-  void buildDynamicSymbolTable(const File &file) override;
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-  void finalizeDefaultAtomValues() override;
-};
-
-//===----------------------------------------------------------------------===//
-//  DynamicLibraryWriter
-//===----------------------------------------------------------------------===//
-template <class ELFT>
-void DynamicLibraryWriter<ELFT>::buildDynamicSymbolTable(const File &file) {
-  // Add all the defined symbols to the dynamic symbol table
-  // we need hooks into the Atom to find out which atoms need
-  // to be exported
-  for (auto sec : this->_layout.sections())
-    if (auto section = dyn_cast<AtomSection<ELFT>>(sec))
-      for (const auto &atom : section->atoms()) {
-        const DefinedAtom *da = dyn_cast<const DefinedAtom>(atom->_atom);
-        if (da && (da->scope() == DefinedAtom::scopeGlobal))
-          this->_dynamicSymbolTable->addSymbol(atom->_atom, section->ordinal(),
-                                               atom->_virtualAddr, atom);
-      }
-
-  for (const UndefinedAtom *a : file.undefined())
-    this->_dynamicSymbolTable->addSymbol(a, ELF::SHN_UNDEF);
-
-  OutputELFWriter<ELFT>::buildDynamicSymbolTable(file);
-}
-
-/// \brief Hook in lld to add CRuntime file
-template <class ELFT>
-void DynamicLibraryWriter<ELFT>::createImplicitFiles(
-    std::vector<std::unique_ptr<File> > &result) {
-  OutputELFWriter<ELFT>::createImplicitFiles(result);
-  // Add the default atoms as defined by executables
-  auto file = llvm::make_unique<RuntimeFile<ELFT>>(this->_ctx, "C runtime");
-  file->addAbsoluteAtom("_end");
-  result.push_back(std::move(file));
-}
-
-template <class ELFT>
-void DynamicLibraryWriter<ELFT>::finalizeDefaultAtomValues() {
-  OutputELFWriter<ELFT>::finalizeDefaultAtomValues();
-  AtomLayout *underScoreEndAtom = this->_layout.findAbsoluteAtom("_end");
-  assert(underScoreEndAtom);
-
-  if (auto bssSection = this->_layout.findOutputSection(".bss")) {
-    underScoreEndAtom->_virtualAddr =
-        bssSection->virtualAddr() + bssSection->memSize();
-  } else if (auto dataSection = this->_layout.findOutputSection(".data")) {
-    underScoreEndAtom->_virtualAddr =
-        dataSection->virtualAddr() + dataSection->memSize();
-  }
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_DYNAMIC_LIBRARY_WRITER_H
diff --git a/lib/ReaderWriter/ELF/ELFFile.cpp b/lib/ReaderWriter/ELF/ELFFile.cpp
deleted file mode 100644
index 1488f1862b8d..000000000000
--- a/lib/ReaderWriter/ELF/ELFFile.cpp
+++ /dev/null
@@ -1,829 +0,0 @@
-//===- lib/ReaderWriter/ELF/ELFFile.cpp -------------------------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ELFFile.h"
-#include "FileCommon.h"
-#include "llvm/ADT/STLExtras.h"
-
-namespace lld {
-namespace elf {
-
-template <typename ELFT>
-ELFFile<ELFT>::ELFFile(StringRef name, ELFLinkingContext &ctx)
-    : SimpleFile(name), _ordinal(0), _doStringsMerge(ctx.mergeCommonStrings()),
-      _useWrap(false), _ctx(ctx) {
-  setLastError(std::error_code());
-}
-
-template <typename ELFT>
-ELFFile<ELFT>::ELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx)
-    : SimpleFile(mb->getBufferIdentifier()), _mb(std::move(mb)), _ordinal(0),
-      _doStringsMerge(ctx.mergeCommonStrings()),
-      _useWrap(ctx.wrapCalls().size()), _ctx(ctx) {}
-
-template <typename ELFT>
-std::error_code ELFFile<ELFT>::isCompatible(MemoryBufferRef mb,
-                                            ELFLinkingContext &ctx) {
-  return elf::isCompatible<ELFT>(mb, ctx);
-}
-
-template <typename ELFT>
-Atom *ELFFile<ELFT>::findAtom(const Elf_Sym *sourceSym,
-                              const Elf_Sym *targetSym) {
-  // Return the atom for targetSym if we can do so.
-  Atom *target = _symbolToAtomMapping.lookup(targetSym);
-  if (!target)
-    // Some realocations (R_ARM_V4BX) do not have a defined
-    // target.  For this cases make it points to itself.
-    target = _symbolToAtomMapping.lookup(sourceSym);
-
-  if (target->definition() != Atom::definitionRegular)
-    return target;
-  Atom::Scope scope = llvm::cast<DefinedAtom>(target)->scope();
-  if (scope == DefinedAtom::scopeTranslationUnit)
-    return target;
-  if (!redirectReferenceUsingUndefAtom(sourceSym, targetSym))
-    return target;
-
-  // Otherwise, create a new undefined symbol and returns it.
-  StringRef targetName = target->name();
-  auto it = _undefAtomsForGroupChild.find(targetName);
-  if (it != _undefAtomsForGroupChild.end())
-    return it->getValue();
-  auto atom = new (_readerStorage) SimpleUndefinedAtom(*this, targetName);
-  _undefAtomsForGroupChild[targetName] = atom;
-  addAtom(*atom);
-  return atom;
-}
-
-template <typename ELFT>
-ErrorOr<StringRef> ELFFile<ELFT>::getSectionName(const Elf_Shdr *shdr) const {
-  if (!shdr)
-    return StringRef();
-  return _objFile->getSectionName(shdr);
-}
-
-template <class ELFT> std::error_code ELFFile<ELFT>::doParse() {
-  std::error_code ec;
-  _objFile.reset(new llvm::object::ELFFile<ELFT>(_mb->getBuffer(), ec));
-  if (ec)
-    return ec;
-
-  if ((ec = createAtomsFromContext()))
-    return ec;
-
-  // Read input sections from the input file that need to be converted to
-  // atoms
-  if ((ec = createAtomizableSections()))
-    return ec;
-
-  // For mergeable strings, we would need to split the section into various
-  // atoms
-  if ((ec = createMergeableAtoms()))
-    return ec;
-
-  // Create the necessary symbols that are part of the section that we
-  // created in createAtomizableSections function
-  if ((ec = createSymbolsFromAtomizableSections()))
-    return ec;
-
-  // Create the appropriate atoms from the file
-  if ((ec = createAtoms()))
-    return ec;
-  return std::error_code();
-}
-
-template <class ELFT> Reference::KindArch ELFFile<ELFT>::kindArch() {
-  switch (_objFile->getHeader()->e_machine) {
-  case llvm::ELF::EM_X86_64:
-    return Reference::KindArch::x86_64;
-  case llvm::ELF::EM_386:
-    return Reference::KindArch::x86;
-  case llvm::ELF::EM_ARM:
-    return Reference::KindArch::ARM;
-  case llvm::ELF::EM_HEXAGON:
-    return Reference::KindArch::Hexagon;
-  case llvm::ELF::EM_MIPS:
-    return Reference::KindArch::Mips;
-  case llvm::ELF::EM_AARCH64:
-    return Reference::KindArch::AArch64;
-  }
-  llvm_unreachable("unsupported e_machine value");
-}
-
-template <class ELFT>
-std::error_code ELFFile<ELFT>::createAtomizableSections() {
-  // Handle: SHT_REL and SHT_RELA sections:
-  // Increment over the sections, when REL/RELA section types are found add
-  // the contents to the RelocationReferences map.
-  // Record the number of relocs to guess at preallocating the buffer.
-  uint64_t totalRelocs = 0;
-  for (const Elf_Shdr &section : _objFile->sections()) {
-    switch (section.sh_type) {
-    case llvm::ELF::SHT_SYMTAB:
-      _symtab = &section;
-      continue;
-    case llvm::ELF::SHT_SYMTAB_SHNDX: {
-      ErrorOr<ArrayRef<Elf_Word>> tableOrErr = _objFile->getSHNDXTable(section);
-      if (std::error_code ec = tableOrErr.getError())
-        return ec;
-      _shndxTable = *tableOrErr;
-      continue;
-    }
-    }
-
-    if (isIgnoredSection(&section))
-      continue;
-
-    if (isMergeableStringSection(&section)) {
-      _mergeStringSections.push_back(&section);
-      continue;
-    }
-
-    if (section.sh_type == llvm::ELF::SHT_RELA) {
-      auto sHdrOrErr = _objFile->getSection(section.sh_info);
-      if (std::error_code ec = sHdrOrErr.getError())
-        return ec;
-      auto sHdr = *sHdrOrErr;
-      auto rai = _objFile->rela_begin(&section);
-      auto rae = _objFile->rela_end(&section);
-      _relocationAddendReferences[sHdr] = make_range(rai, rae);
-      totalRelocs += std::distance(rai, rae);
-    } else if (section.sh_type == llvm::ELF::SHT_REL) {
-      auto sHdrOrErr = _objFile->getSection(section.sh_info);
-      if (std::error_code ec = sHdrOrErr.getError())
-        return ec;
-      auto sHdr = *sHdrOrErr;
-      auto ri = _objFile->rel_begin(&section);
-      auto re = _objFile->rel_end(&section);
-      _relocationReferences[sHdr] = &section;
-      totalRelocs += std::distance(ri, re);
-    } else {
-      auto sectionName = _objFile->getSectionName(&section);
-      if (std::error_code ec = sectionName.getError())
-        return ec;
-      _ctx.notifyInputSectionName(*sectionName);
-      _sectionSymbols[&section];
-    }
-  }
-  _references.reserve(totalRelocs);
-  return std::error_code();
-}
-
-template <class ELFT> std::error_code ELFFile<ELFT>::createMergeableAtoms() {
-  // Divide the section that contains mergeable strings into tokens
-  // TODO
-  // a) add resolver support to recognize multibyte chars
-  // b) Create a separate section chunk to write mergeable atoms
-  std::vector<MergeString *> tokens;
-  for (const Elf_Shdr *msi : _mergeStringSections) {
-    auto sectionName = getSectionName(msi);
-    if (std::error_code ec = sectionName.getError())
-      return ec;
-
-    auto sectionContents = getSectionContents(msi);
-    if (std::error_code ec = sectionContents.getError())
-      return ec;
-
-    StringRef secCont(reinterpret_cast<const char *>(sectionContents->begin()),
-                      sectionContents->size());
-
-    unsigned int prev = 0;
-    for (std::size_t i = 0, e = sectionContents->size(); i != e; ++i) {
-      if ((*sectionContents)[i] == '\0') {
-        tokens.push_back(new (_readerStorage) MergeString(
-            prev, secCont.slice(prev, i + 1), msi, *sectionName));
-        prev = i + 1;
-      }
-    }
-  }
-
-  // Create Mergeable atoms
-  for (const MergeString *tai : tokens) {
-    ArrayRef<uint8_t> content((const uint8_t *)tai->_string.data(),
-                              tai->_string.size());
-    ELFMergeAtom<ELFT> *atom = createMergedString(tai->_sectionName, tai->_shdr,
-                                                  content, tai->_offset);
-    atom->setOrdinal(++_ordinal);
-    addAtom(*atom);
-    _mergeAtoms.push_back(atom);
-  }
-  return std::error_code();
-}
-
-template <class ELFT>
-std::error_code ELFFile<ELFT>::createSymbolsFromAtomizableSections() {
-  // Increment over all the symbols collecting atoms and symbol names for
-  // later use.
-  if (!_symtab)
-    return std::error_code();
-
-  ErrorOr<StringRef> strTableOrErr =
-      _objFile->getStringTableForSymtab(*_symtab);
-  if (std::error_code ec = strTableOrErr.getError())
-    return ec;
-  StringRef strTable = *strTableOrErr;
-
-  auto SymI = _objFile->symbol_begin(_symtab),
-       SymE = _objFile->symbol_end(_symtab);
-  // Skip over dummy sym.
-  ++SymI;
-
-  for (; SymI != SymE; ++SymI) {
-    ErrorOr<const Elf_Shdr *> section =
-        _objFile->getSection(SymI, _symtab, _shndxTable);
-    if (std::error_code ec = section.getError())
-      return ec;
-
-    auto symbolName = SymI->getName(strTable);
-    if (std::error_code ec = symbolName.getError())
-      return ec;
-
-    if (SymI->isAbsolute()) {
-      ELFAbsoluteAtom<ELFT> *absAtom = createAbsoluteAtom(
-          *symbolName, &*SymI, (int64_t)getSymbolValue(&*SymI));
-      addAtom(*absAtom);
-      _symbolToAtomMapping.insert(std::make_pair(&*SymI, absAtom));
-    } else if (SymI->isUndefined()) {
-      if (_useWrap &&
-          (_wrapSymbolMap.find(*symbolName) != _wrapSymbolMap.end())) {
-        auto wrapAtom = _wrapSymbolMap.find(*symbolName);
-        _symbolToAtomMapping.insert(
-            std::make_pair(&*SymI, wrapAtom->getValue()));
-        continue;
-      }
-      ELFUndefinedAtom<ELFT> *undefAtom =
-          createUndefinedAtom(*symbolName, &*SymI);
-      addAtom(*undefAtom);
-      _symbolToAtomMapping.insert(std::make_pair(&*SymI, undefAtom));
-    } else if (isCommonSymbol(&*SymI)) {
-      ELFCommonAtom<ELFT> *commonAtom = createCommonAtom(*symbolName, &*SymI);
-      commonAtom->setOrdinal(++_ordinal);
-      addAtom(*commonAtom);
-      _symbolToAtomMapping.insert(std::make_pair(&*SymI, commonAtom));
-    } else if (SymI->isDefined()) {
-      _sectionSymbols[*section].push_back(SymI);
-    } else {
-      llvm::errs() << "Unable to create atom for: " << *symbolName << "\n";
-      return llvm::object::object_error::parse_failed;
-    }
-  }
-
-  return std::error_code();
-}
-
-template <class ELFT> std::error_code ELFFile<ELFT>::createAtoms() {
-  // Holds all the atoms that are part of the section. They are the targets of
-  // the kindGroupChild reference.
-  llvm::StringMap<std::vector<ELFDefinedAtom<ELFT> *>> atomsForSection;
-
-  // Contains a list of comdat sections for a group.
-  for (auto &i : _sectionSymbols) {
-    const Elf_Shdr *section = i.first;
-    std::vector<const Elf_Sym *> &symbols = i.second;
-
-    // Sort symbols by position.
-    std::stable_sort(symbols.begin(), symbols.end(),
-                     [this](const Elf_Sym *a, const Elf_Sym *b) {
-                       return getSymbolValue(&*a) < getSymbolValue(&*b);
-                     });
-
-    ErrorOr<StringRef> sectionName = this->getSectionName(section);
-    if (std::error_code ec = sectionName.getError())
-      return ec;
-
-    auto sectionContents = getSectionContents(section);
-    if (std::error_code ec = sectionContents.getError())
-      return ec;
-
-    // SHT_GROUP sections are handled in the following loop.
-    if (isGroupSection(section))
-      continue;
-
-    bool addAtoms = (!isGnuLinkOnceSection(*sectionName) &&
-                     !isSectionMemberOfGroup(section));
-
-    if (handleSectionWithNoSymbols(section, symbols)) {
-      ELFDefinedAtom<ELFT> *newAtom =
-          createSectionAtom(section, *sectionName, *sectionContents);
-      newAtom->setOrdinal(++_ordinal);
-      if (addAtoms)
-        addAtom(*newAtom);
-      else
-        atomsForSection[*sectionName].push_back(newAtom);
-      continue;
-    }
-
-    ELFDefinedAtom<ELFT> *previousAtom = nullptr;
-    ELFReference<ELFT> *anonFollowedBy = nullptr;
-
-    if (!_symtab)
-      continue;
-    ErrorOr<StringRef> strTableOrErr =
-        _objFile->getStringTableForSymtab(*_symtab);
-    if (std::error_code ec = strTableOrErr.getError())
-      return ec;
-    StringRef strTable = *strTableOrErr;
-    for (auto si = symbols.begin(), se = symbols.end(); si != se; ++si) {
-      auto symbol = *si;
-      StringRef symbolName = "";
-      if (symbol->getType() != llvm::ELF::STT_SECTION) {
-        auto symName = symbol->getName(strTable);
-        if (std::error_code ec = symName.getError())
-          return ec;
-        symbolName = *symName;
-      }
-
-      uint64_t contentSize = symbolContentSize(
-          section, &*symbol, (si + 1 == se) ? nullptr : &**(si + 1));
-
-      // Check to see if we need to add the FollowOn Reference
-      ELFReference<ELFT> *followOn = nullptr;
-      if (previousAtom) {
-        // Replace the followon atom with the anonymous atom that we created,
-        // so that the next symbol that we create is a followon from the
-        // anonymous atom.
-        if (anonFollowedBy) {
-          followOn = anonFollowedBy;
-        } else {
-          followOn = new (_readerStorage)
-              ELFReference<ELFT>(Reference::kindLayoutAfter);
-          previousAtom->addReference(followOn);
-        }
-      }
-
-      ArrayRef<uint8_t> symbolData((const uint8_t *)sectionContents->data() +
-                                       getSymbolValue(&*symbol),
-                                   contentSize);
-
-      // If the linker finds that a section has global atoms that are in a
-      // mergeable section, treat them as defined atoms as they shouldn't be
-      // merged away as well as these symbols have to be part of symbol
-      // resolution
-      if (isMergeableStringSection(section)) {
-        if (symbol->getBinding() != llvm::ELF::STB_GLOBAL)
-          continue;
-        ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
-            symbolName, *sectionName, &**si, section, symbolData,
-            _references.size(), _references.size(), _references);
-        atom->setOrdinal(++_ordinal);
-        if (addAtoms)
-          addAtom(*atom);
-        else
-          atomsForSection[*sectionName].push_back(atom);
-        continue;
-      }
-
-      // Don't allocate content to a weak symbol, as they may be merged away.
-      // Create an anonymous atom to hold the data.
-      ELFDefinedAtom<ELFT> *anonAtom = nullptr;
-      anonFollowedBy = nullptr;
-      if (symbol->getBinding() == llvm::ELF::STB_WEAK) {
-        // Create anonymous new non-weak ELF symbol that holds the symbol
-        // data.
-        auto sym = new (_readerStorage) Elf_Sym(*symbol);
-        sym->setBinding(llvm::ELF::STB_GLOBAL);
-        anonAtom = createDefinedAtomAndAssignRelocations(
-            "", *sectionName, sym, section, symbolData, *sectionContents);
-        symbolData = ArrayRef<uint8_t>();
-
-        // If this is the last atom, let's not create a followon reference.
-        if (anonAtom && (si + 1) != se) {
-          anonFollowedBy = new (_readerStorage)
-              ELFReference<ELFT>(Reference::kindLayoutAfter);
-          anonAtom->addReference(anonFollowedBy);
-        }
-      }
-
-      ELFDefinedAtom<ELFT> *newAtom = createDefinedAtomAndAssignRelocations(
-          symbolName, *sectionName, &*symbol, section, symbolData,
-          *sectionContents);
-      newAtom->setOrdinal(++_ordinal);
-
-      // If the atom was a weak symbol, let's create a followon reference to
-      // the anonymous atom that we created.
-      if (anonAtom)
-        createEdge(newAtom, anonAtom, Reference::kindLayoutAfter);
-
-      if (previousAtom) {
-        // Set the followon atom to the weak atom that we have created, so
-        // that they would alias when the file gets written.
-        followOn->setTarget(anonAtom ? anonAtom : newAtom);
-      }
-
-      // The previous atom is always the atom created before unless the atom
-      // is a weak atom.
-      previousAtom = anonAtom ? anonAtom : newAtom;
-
-      if (addAtoms)
-        addAtom(*newAtom);
-      else
-        atomsForSection[*sectionName].push_back(newAtom);
-
-      _symbolToAtomMapping.insert(std::make_pair(&*symbol, newAtom));
-      if (anonAtom) {
-        anonAtom->setOrdinal(++_ordinal);
-        if (addAtoms)
-          addAtom(*anonAtom);
-        else
-          atomsForSection[*sectionName].push_back(anonAtom);
-      }
-    }
-  }
-
-  for (auto &i : _sectionSymbols)
-    if (std::error_code ec = handleSectionGroup(i.first, atomsForSection))
-      return ec;
-  for (auto &i : _sectionSymbols)
-    if (std::error_code ec = handleGnuLinkOnceSection(i.first, atomsForSection))
-      return ec;
-
-  updateReferences();
-  return std::error_code();
-}
-
-template <class ELFT>
-std::error_code ELFFile<ELFT>::handleGnuLinkOnceSection(
-    const Elf_Shdr *section,
-    llvm::StringMap<std::vector<ELFDefinedAtom<ELFT> *>> &atomsForSection) {
-  ErrorOr<StringRef> sectionName = this->getSectionName(section);
-  if (std::error_code ec = sectionName.getError())
-    return ec;
-  if (!isGnuLinkOnceSection(*sectionName))
-    return std::error_code();
-
-  unsigned int referenceStart = _references.size();
-  std::vector<ELFReference<ELFT> *> refs;
-  for (auto ha : atomsForSection[*sectionName]) {
-    _groupChild[ha->symbol()] = std::make_pair(*sectionName, section);
-    auto *ref =
-        new (_readerStorage) ELFReference<ELFT>(Reference::kindGroupChild);
-    ref->setTarget(ha);
-    refs.push_back(ref);
-  }
-  atomsForSection[*sectionName].clear();
-  // Create a gnu linkonce atom.
-  ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
-      *sectionName, *sectionName, nullptr, section, ArrayRef<uint8_t>(),
-      referenceStart, _references.size(), _references);
-  atom->setOrdinal(++_ordinal);
-  addAtom(*atom);
-  for (auto reference : refs)
-    atom->addReference(reference);
-  return std::error_code();
-}
-
-template <class ELFT>
-std::error_code ELFFile<ELFT>::handleSectionGroup(
-    const Elf_Shdr *section,
-    llvm::StringMap<std::vector<ELFDefinedAtom<ELFT> *>> &atomsForSection) {
-  ErrorOr<StringRef> sectionName = this->getSectionName(section);
-  if (std::error_code ec = sectionName.getError())
-    return ec;
-  if (!isGroupSection(section))
-    return std::error_code();
-
-  auto sectionContents = getSectionContents(section);
-  if (std::error_code ec = sectionContents.getError())
-    return ec;
-
-  // A section of type SHT_GROUP defines a grouping of sections. The
-  // name of a symbol from one of the containing object's symbol tables
-  // provides a signature for the section group. The section header of
-  // the SHT_GROUP section specifies the identifying symbol entry, as
-  // described: the sh_link member contains the section header index of
-  // the symbol table section that contains the entry. The sh_info
-  // member contains the symbol table index of the identifying entry.
-  // The sh_flags member of the section header contains 0. The name of
-  // the section (sh_name) is not specified.
-  std::vector<StringRef> sectionNames;
-  const Elf_Word *groupMembers =
-      reinterpret_cast<const Elf_Word *>(sectionContents->data());
-  const size_t count = section->sh_size / sizeof(Elf_Word);
-  for (size_t i = 1; i < count; i++) {
-    ErrorOr<const Elf_Shdr *> shdr = _objFile->getSection(groupMembers[i]);
-    if (std::error_code ec = shdr.getError())
-      return ec;
-    ErrorOr<StringRef> sectionName = _objFile->getSectionName(*shdr);
-    if (std::error_code ec = sectionName.getError())
-      return ec;
-    sectionNames.push_back(*sectionName);
-  }
-  ErrorOr<const Elf_Shdr *> symtab = _objFile->getSection(section->sh_link);
-  if (std::error_code ec = symtab.getError())
-    return ec;
-  const Elf_Sym *symbol = _objFile->getSymbol(*symtab, section->sh_info);
-  ErrorOr<const Elf_Shdr *> strtab_sec =
-      _objFile->getSection((*symtab)->sh_link);
-  if (std::error_code ec = strtab_sec.getError())
-    return ec;
-  ErrorOr<StringRef> strtab_or_err = _objFile->getStringTable(*strtab_sec);
-  if (std::error_code ec = strtab_or_err.getError())
-    return ec;
-  StringRef strtab = *strtab_or_err;
-  ErrorOr<StringRef> symbolName = symbol->getName(strtab);
-  if (std::error_code ec = symbolName.getError())
-    return ec;
-
-  unsigned int referenceStart = _references.size();
-  std::vector<ELFReference<ELFT> *> refs;
-  for (auto name : sectionNames) {
-    for (auto ha : atomsForSection[name]) {
-      _groupChild[ha->symbol()] = std::make_pair(*symbolName, section);
-      auto *ref =
-          new (_readerStorage) ELFReference<ELFT>(Reference::kindGroupChild);
-      ref->setTarget(ha);
-      refs.push_back(ref);
-    }
-    atomsForSection[name].clear();
-  }
-
-  // Create an atom for comdat signature.
-  ELFDefinedAtom<ELFT> *atom = createDefinedAtom(
-      *symbolName, *sectionName, nullptr, section, ArrayRef<uint8_t>(),
-      referenceStart, _references.size(), _references);
-  atom->setOrdinal(++_ordinal);
-  addAtom(*atom);
-  for (auto reference : refs)
-    atom->addReference(reference);
-  return std::error_code();
-}
-
-template <class ELFT> std::error_code ELFFile<ELFT>::createAtomsFromContext() {
-  if (!_useWrap)
-    return std::error_code();
-  // Steps:
-  // a) Create an undefined atom for the symbol specified by the --wrap option,
-  //    as that may be needed to be pulled from an archive.
-  // b) Create an undefined atom for __wrap_<symbolname>.
-  // c) All references to the symbol specified by wrap should point to
-  //    __wrap_<symbolname>
-  // d) All references to __real_symbol should point to the <symbol>
-  for (auto &wrapsym : _ctx.wrapCalls()) {
-    StringRef wrapStr = wrapsym.getKey();
-    // Create a undefined symbol fror the wrap symbol.
-    UndefinedAtom *wrapSymAtom =
-        new (_readerStorage) SimpleUndefinedAtom(*this, wrapStr);
-    StringRef wrapCallSym =
-        _ctx.allocateString((llvm::Twine("__wrap_") + wrapStr).str());
-    StringRef realCallSym =
-        _ctx.allocateString((llvm::Twine("__real_") + wrapStr).str());
-    UndefinedAtom *wrapCallAtom =
-        new (_readerStorage) SimpleUndefinedAtom(*this, wrapCallSym);
-    // Create maps, when there is call to sym, it should point to wrapCallSym.
-    _wrapSymbolMap.insert(std::make_pair(wrapStr, wrapCallAtom));
-    // Whenever there is a reference to realCall it should point to the symbol
-    // created for each wrap usage.
-    _wrapSymbolMap.insert(std::make_pair(realCallSym, wrapSymAtom));
-    addAtom(*wrapSymAtom);
-    addAtom(*wrapCallAtom);
-  }
-  return std::error_code();
-}
-
-template <class ELFT>
-ELFDefinedAtom<ELFT> *ELFFile<ELFT>::createDefinedAtomAndAssignRelocations(
-    StringRef symbolName, StringRef sectionName, const Elf_Sym *symbol,
-    const Elf_Shdr *section, ArrayRef<uint8_t> symContent,
-    ArrayRef<uint8_t> secContent) {
-  unsigned int referenceStart = _references.size();
-
-  // Add Rela (those with r_addend) references:
-  auto rari = _relocationAddendReferences.find(section);
-  if (rari != _relocationAddendReferences.end())
-    createRelocationReferences(symbol, symContent, rari->second);
-
-  // Add Rel references.
-  auto rri = _relocationReferences.find(section);
-  if (rri != _relocationReferences.end())
-    createRelocationReferences(symbol, symContent, secContent, rri->second);
-
-  // Create the DefinedAtom and add it to the list of DefinedAtoms.
-  return createDefinedAtom(symbolName, sectionName, symbol, section, symContent,
-                           referenceStart, _references.size(), _references);
-}
-
-template <class ELFT>
-void ELFFile<ELFT>::createRelocationReferences(const Elf_Sym *symbol,
-                                               ArrayRef<uint8_t> content,
-                                               range<const Elf_Rela *> rels) {
-  bool isMips64EL = _objFile->isMips64EL();
-  const auto symValue = getSymbolValue(symbol);
-  for (const auto &rel : rels) {
-    if (rel.r_offset < symValue || symValue + content.size() <= rel.r_offset)
-      continue;
-    auto elfRelocation = new (_readerStorage)
-        ELFReference<ELFT>(&rel, rel.r_offset - symValue, kindArch(),
-                           rel.getType(isMips64EL), rel.getSymbol(isMips64EL));
-    addReferenceToSymbol(elfRelocation, symbol);
-    _references.push_back(elfRelocation);
-  }
-}
-
-template <class ELFT>
-void ELFFile<ELFT>::createRelocationReferences(const Elf_Sym *symbol,
-                                               ArrayRef<uint8_t> symContent,
-                                               ArrayRef<uint8_t> secContent,
-                                               const Elf_Shdr *relSec) {
-  auto rels = _objFile->rels(relSec);
-  bool isMips64EL = _objFile->isMips64EL();
-  const auto symValue = getSymbolValue(symbol);
-  for (const auto &rel : rels) {
-    if (rel.r_offset < symValue || symValue + symContent.size() <= rel.r_offset)
-      continue;
-    auto elfRelocation = new (_readerStorage)
-        ELFReference<ELFT>(rel.r_offset - symValue, kindArch(),
-                           rel.getType(isMips64EL), rel.getSymbol(isMips64EL));
-    Reference::Addend addend = getInitialAddend(symContent, symValue, rel);
-    elfRelocation->setAddend(addend);
-    addReferenceToSymbol(elfRelocation, symbol);
-    _references.push_back(elfRelocation);
-  }
-}
-
-template <class ELFT>
-void ELFFile<ELFT>::updateReferenceForMergeStringAccess(ELFReference<ELFT> *ref,
-                                                        const Elf_Sym *symbol,
-                                                        const Elf_Shdr *shdr) {
-  // If the target atom is mergeable strefng atom, the atom might have been
-  // merged with other atom having the same contents. Try to find the
-  // merged one if that's the case.
-  int64_t addend = ref->addend();
-  if (addend < 0)
-    addend = 0;
-
-  const MergeSectionKey ms = {shdr, addend};
-  auto msec = _mergedSectionMap.find(ms);
-  if (msec != _mergedSectionMap.end()) {
-    ref->setTarget(msec->second);
-    return;
-  }
-
-  // The target atom was not merged. Mergeable atoms are not in
-  // _symbolToAtomMapping, so we cannot find it by calling findAtom(). We
-  // instead call findMergeAtom().
-  if (symbol->getType() != llvm::ELF::STT_SECTION)
-    addend = getSymbolValue(symbol) + addend;
-  ELFMergeAtom<ELFT> *mergedAtom = findMergeAtom(shdr, addend);
-  ref->setOffset(addend - mergedAtom->offset());
-  ref->setAddend(0);
-  ref->setTarget(mergedAtom);
-}
-
-template <class ELFT> void ELFFile<ELFT>::updateReferences() {
-  for (auto &ri : _references) {
-    if (ri->kindNamespace() != Reference::KindNamespace::ELF)
-      continue;
-    const Elf_Sym *symbol =
-        _objFile->getSymbol(_symtab, ri->targetSymbolIndex());
-    ErrorOr<const Elf_Shdr *> shdr =
-        _objFile->getSection(symbol, _symtab, _shndxTable);
-
-    // If the atom is not in mergeable string section, the target atom is
-    // simply that atom.
-    if (isMergeableStringSection(*shdr))
-      updateReferenceForMergeStringAccess(ri, symbol, *shdr);
-    else
-      ri->setTarget(findAtom(findSymbolForReference(ri), symbol));
-  }
-}
-
-template <class ELFT>
-bool ELFFile<ELFT>::isIgnoredSection(const Elf_Shdr *section) {
-  switch (section->sh_type) {
-  case llvm::ELF::SHT_NULL:
-  case llvm::ELF::SHT_STRTAB:
-  case llvm::ELF::SHT_SYMTAB:
-  case llvm::ELF::SHT_SYMTAB_SHNDX:
-    return true;
-  default:
-    break;
-  }
-  return false;
-}
-
-template <class ELFT>
-bool ELFFile<ELFT>::isMergeableStringSection(const Elf_Shdr *section) {
-  if (_doStringsMerge && section) {
-    int64_t sectionFlags = section->sh_flags;
-    sectionFlags &= ~llvm::ELF::SHF_ALLOC;
-    // Mergeable string sections have both SHF_MERGE and SHF_STRINGS flags
-    // set. sh_entsize is the size of each character which is normally 1.
-    if ((section->sh_entsize < 2) &&
-        (sectionFlags == (llvm::ELF::SHF_MERGE | llvm::ELF::SHF_STRINGS))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-template <class ELFT>
-ELFDefinedAtom<ELFT> *
-ELFFile<ELFT>::createSectionAtom(const Elf_Shdr *section, StringRef sectionName,
-                                 ArrayRef<uint8_t> content) {
-  auto *sym = new (_readerStorage) Elf_Sym;
-  sym->st_name = 0;
-  sym->setBindingAndType(llvm::ELF::STB_LOCAL, llvm::ELF::STT_SECTION);
-  sym->st_other = 0;
-  sym->st_shndx = 0;
-  sym->st_value = 0;
-  sym->st_size = 0;
-  auto *newAtom = createDefinedAtomAndAssignRelocations(
-      "", sectionName, sym, section, content, content);
-  newAtom->setOrdinal(++_ordinal);
-  return newAtom;
-}
-
-template <class ELFT>
-uint64_t ELFFile<ELFT>::symbolContentSize(const Elf_Shdr *section,
-                                          const Elf_Sym *symbol,
-                                          const Elf_Sym *nextSymbol) {
-  const auto symValue = getSymbolValue(symbol);
-  // if this is the last symbol, take up the remaining data.
-  return nextSymbol ? getSymbolValue(nextSymbol) - symValue
-                    : section->sh_size - symValue;
-}
-
-template <class ELFT>
-void ELFFile<ELFT>::createEdge(ELFDefinedAtom<ELFT> *from,
-                               ELFDefinedAtom<ELFT> *to, uint32_t edgeKind) {
-  auto reference = new (_readerStorage) ELFReference<ELFT>(edgeKind);
-  reference->setTarget(to);
-  from->addReference(reference);
-}
-
-/// Does the atom need to be redirected using a separate undefined atom?
-template <class ELFT>
-bool ELFFile<ELFT>::redirectReferenceUsingUndefAtom(
-    const Elf_Sym *sourceSymbol, const Elf_Sym *targetSymbol) const {
-  auto groupChildTarget = _groupChild.find(targetSymbol);
-
-  // If the reference is not to a group child atom, there is no need to redirect
-  // using a undefined atom. Its also not needed if the source and target are
-  // from the same section.
-  if ((groupChildTarget == _groupChild.end()) ||
-      (sourceSymbol->st_shndx == targetSymbol->st_shndx))
-    return false;
-
-  auto groupChildSource = _groupChild.find(sourceSymbol);
-
-  // If the source symbol is not in a group, use a undefined symbol too.
-  if (groupChildSource == _groupChild.end())
-    return true;
-
-  // If the source and child are from the same group, we dont need the
-  // relocation to go through a undefined symbol.
-  if (groupChildSource->second.second == groupChildTarget->second.second)
-    return false;
-  return true;
-}
-
-template <class ELFT>
-void RuntimeFile<ELFT>::addAbsoluteAtom(StringRef symbolName, bool isHidden) {
-  assert(!symbolName.empty() && "AbsoluteAtoms must have a name");
-  auto *sym = new (this->_readerStorage) Elf_Sym;
-  sym->st_name = 0;
-  sym->st_value = 0;
-  sym->st_shndx = llvm::ELF::SHN_ABS;
-  sym->setBindingAndType(llvm::ELF::STB_GLOBAL, llvm::ELF::STT_OBJECT);
-  if (isHidden)
-    sym->setVisibility(llvm::ELF::STV_HIDDEN);
-  else
-    sym->setVisibility(llvm::ELF::STV_DEFAULT);
-  sym->st_size = 0;
-  ELFAbsoluteAtom<ELFT> *atom = this->createAbsoluteAtom(symbolName, sym, -1);
-  this->addAtom(*atom);
-}
-
-template <class ELFT>
-void RuntimeFile<ELFT>::addUndefinedAtom(StringRef symbolName) {
-  assert(!symbolName.empty() && "UndefinedAtoms must have a name");
-  auto *sym = new (this->_readerStorage) Elf_Sym;
-  sym->st_name = 0;
-  sym->st_value = 0;
-  sym->st_shndx = llvm::ELF::SHN_UNDEF;
-  sym->setBindingAndType(llvm::ELF::STB_GLOBAL, llvm::ELF::STT_NOTYPE);
-  sym->setVisibility(llvm::ELF::STV_DEFAULT);
-  sym->st_size = 0;
-  ELFUndefinedAtom<ELFT> *atom = this->createUndefinedAtom(symbolName, sym);
-  this->addAtom(*atom);
-}
-
-template class ELFFile<ELF32LE>;
-template class ELFFile<ELF32BE>;
-template class ELFFile<ELF64LE>;
-template class ELFFile<ELF64BE>;
-
-template class RuntimeFile<ELF32LE>;
-template class RuntimeFile<ELF32BE>;
-template class RuntimeFile<ELF64LE>;
-template class RuntimeFile<ELF64BE>;
-
-} // end namespace elf
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/ELFFile.h b/lib/ReaderWriter/ELF/ELFFile.h
deleted file mode 100644
index 5e0c2fc75a87..000000000000
--- a/lib/ReaderWriter/ELF/ELFFile.h
+++ /dev/null
@@ -1,395 +0,0 @@
-//===- lib/ReaderWriter/ELF/ELFFile.h ---------------------------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_FILE_H
-#define LLD_READER_WRITER_ELF_FILE_H
-
-#include "Atoms.h"
-#include "FileCommon.h"
-#include "llvm/ADT/MapVector.h"
-#include <map>
-#include <unordered_map>
-
-namespace lld {
-
-namespace elf {
-/// \brief Read a binary, find out based on the symbol table contents what kind
-/// of symbol it is and create corresponding atoms for it
-template <class ELFT> class ELFFile : public SimpleFile {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-  typedef llvm::object::Elf_Rel_Impl<ELFT, false> Elf_Rel;
-  typedef llvm::object::Elf_Rel_Impl<ELFT, true> Elf_Rela;
-  typedef typename llvm::object::ELFFile<ELFT>::Elf_Word Elf_Word;
-
-  // A Map is used to hold the atoms that have been divided up
-  // after reading the section that contains Merge String attributes
-  struct MergeSectionKey {
-    const Elf_Shdr *_shdr;
-    int64_t _offset;
-  };
-
-  struct MergeSectionEq {
-    int64_t operator()(const MergeSectionKey &k) const {
-      return llvm::hash_combine((int64_t)(k._shdr->sh_name),
-                                (int64_t)k._offset);
-    }
-    bool operator()(const MergeSectionKey &lhs,
-                    const MergeSectionKey &rhs) const {
-      return ((lhs._shdr->sh_name == rhs._shdr->sh_name) &&
-              (lhs._offset == rhs._offset));
-    }
-  };
-
-  struct MergeString {
-    MergeString(int64_t offset, StringRef str, const Elf_Shdr *shdr,
-                StringRef sectionName)
-        : _offset(offset), _string(str), _shdr(shdr),
-          _sectionName(sectionName) {}
-    // the offset of this atom
-    int64_t _offset;
-    // The content
-    StringRef _string;
-    // Section header
-    const Elf_Shdr *_shdr;
-    // Section name
-    StringRef _sectionName;
-  };
-
-  // This is used to find the MergeAtom given a relocation
-  // offset
-  typedef std::vector<ELFMergeAtom<ELFT> *> MergeAtomsT;
-
-  /// \brief find a merge atom given a offset
-  ELFMergeAtom<ELFT> *findMergeAtom(const Elf_Shdr *shdr, int64_t offset) {
-    auto it = std::find_if(_mergeAtoms.begin(), _mergeAtoms.end(),
-                           [=](const ELFMergeAtom<ELFT> *a) {
-                             int64_t off = a->offset();
-                             return shdr->sh_name == a->section() &&
-                                    offset >= off &&
-                                    offset <= off + (int64_t)a->size();
-                           });
-    assert(it != _mergeAtoms.end());
-    return *it;
-  }
-
-  typedef std::unordered_map<MergeSectionKey, DefinedAtom *, MergeSectionEq,
-                             MergeSectionEq> MergedSectionMapT;
-  typedef typename MergedSectionMapT::iterator MergedSectionMapIterT;
-
-public:
-  ELFFile(StringRef name, ELFLinkingContext &ctx);
-  ELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx);
-
-  static std::error_code isCompatible(MemoryBufferRef mb,
-                                      ELFLinkingContext &ctx);
-
-  static bool canParse(file_magic magic) {
-    return magic == file_magic::elf_relocatable;
-  }
-
-  virtual Reference::KindArch kindArch();
-
-  /// \brief Create symbols from LinkingContext.
-  std::error_code createAtomsFromContext();
-
-  /// \brief Read input sections and populate necessary data structures
-  /// to read them later and create atoms
-  std::error_code createAtomizableSections();
-
-  /// \brief Create mergeable atoms from sections that have the merge attribute
-  /// set
-  std::error_code createMergeableAtoms();
-
-  /// \brief Add the symbols that the sections contain. The symbols will be
-  /// converted to atoms for
-  /// Undefined symbols, absolute symbols
-  std::error_code createSymbolsFromAtomizableSections();
-
-  /// \brief Create individual atoms
-  std::error_code createAtoms();
-
-  // Assuming sourceSymbol has a reference to targetSym, find an atom
-  // for targetSym. Usually it's just the atom for targetSym.
-  // However, if an atom is in a section group, we may want to return an
-  // undefined atom for targetSym to let the resolver to resolve the
-  // symbol. (It's because if targetSym is in a section group A, and the
-  // group A is not linked in because other file already provides a
-  // section group B, we want to resolve references to B, not to A.)
-  Atom *findAtom(const Elf_Sym *sourceSym, const Elf_Sym *targetSym);
-
-protected:
-  ELFDefinedAtom<ELFT> *createDefinedAtomAndAssignRelocations(
-      StringRef symbolName, StringRef sectionName, const Elf_Sym *symbol,
-      const Elf_Shdr *section, ArrayRef<uint8_t> symContent,
-      ArrayRef<uint8_t> secContent);
-
-  std::error_code doParse() override;
-
-  /// \brief Iterate over Elf_Rela relocations list and create references.
-  virtual void createRelocationReferences(const Elf_Sym *symbol,
-                                          ArrayRef<uint8_t> content,
-                                          range<const Elf_Rela *> rels);
-
-  /// \brief Iterate over Elf_Rel relocations list and create references.
-  virtual void createRelocationReferences(const Elf_Sym *symbol,
-                                          ArrayRef<uint8_t> symContent,
-                                          ArrayRef<uint8_t> secContent,
-                                          const Elf_Shdr *relSec);
-
-  /// \brief After all the Atoms and References are created, update each
-  /// Reference's target with the Atom pointer it refers to.
-  void updateReferences();
-
-  /// \brief Update the reference if the access corresponds to a merge string
-  /// section.
-  void updateReferenceForMergeStringAccess(ELFReference<ELFT> *ref,
-                                           const Elf_Sym *symbol,
-                                           const Elf_Shdr *shdr);
-
-  /// \brief Do we want to ignore the section. Ignored sections are
-  /// not processed to create atoms
-  bool isIgnoredSection(const Elf_Shdr *section);
-
-  /// \brief Is the current section be treated as a mergeable string section.
-  /// The contents of a mergeable string section are null-terminated strings.
-  /// If the section have mergeable strings, the linker would need to split
-  /// the section into multiple atoms and mark them mergeByContent.
-  bool isMergeableStringSection(const Elf_Shdr *section);
-
-  /// \brief Returns a new anonymous atom whose size is equal to the
-  /// section size. That atom will be used to represent the entire
-  /// section that have no symbols.
-  ELFDefinedAtom<ELFT> *createSectionAtom(const Elf_Shdr *section,
-                                          StringRef sectionName,
-                                          ArrayRef<uint8_t> contents);
-
-  /// Returns the symbol's content size. The nextSymbol should be null if the
-  /// symbol is the last one in the section.
-  uint64_t symbolContentSize(const Elf_Shdr *section,
-                             const Elf_Sym *symbol,
-                             const Elf_Sym *nextSymbol);
-
-  void createEdge(ELFDefinedAtom<ELFT> *from, ELFDefinedAtom<ELFT> *to,
-                  uint32_t edgeKind);
-
-  /// Get the section name for a section.
-  ErrorOr<StringRef> getSectionName(const Elf_Shdr *shdr) const;
-
-  /// Determines if the section occupy memory space.
-  bool sectionOccupiesMemorySpace(const Elf_Shdr *shdr) const {
-    return (shdr->sh_type != llvm::ELF::SHT_NOBITS);
-  }
-
-  /// Return the section contents.
-  ErrorOr<ArrayRef<uint8_t>> getSectionContents(const Elf_Shdr *shdr) const {
-    if (!shdr || !sectionOccupiesMemorySpace(shdr))
-      return ArrayRef<uint8_t>();
-    return _objFile->getSectionContents(shdr);
-  }
-
-  /// Determines if the target wants to create an atom for a section that has no
-  /// symbol references.
-  bool
-  handleSectionWithNoSymbols(const Elf_Shdr *shdr,
-                             std::vector<const Elf_Sym *> &syms) const {
-    return shdr &&
-           (shdr->sh_type == llvm::ELF::SHT_PROGBITS ||
-            shdr->sh_type == llvm::ELF::SHT_INIT_ARRAY ||
-            shdr->sh_type == llvm::ELF::SHT_FINI_ARRAY ||
-            shdr->sh_type == llvm::ELF::SHT_NOTE) &&
-           syms.empty();
-  }
-
-  /// Handle creation of atoms for .gnu.linkonce sections.
-  std::error_code handleGnuLinkOnceSection(
-      const Elf_Shdr *section,
-      llvm::StringMap<std::vector<ELFDefinedAtom<ELFT> *>> &atomsForSection);
-
-  // Handle COMDAT scetions.
-  std::error_code handleSectionGroup(
-      const Elf_Shdr *section,
-      llvm::StringMap<std::vector<ELFDefinedAtom<ELFT> *>> &atomsForSection);
-
-  /// Process the Undefined symbol and create an atom for it.
-  ELFUndefinedAtom<ELFT> *createUndefinedAtom(StringRef symName,
-                                              const Elf_Sym *sym) {
-    return new (_readerStorage) ELFUndefinedAtom<ELFT>(*this, symName, sym);
-  }
-
-  /// Process the Absolute symbol and create an atom for it.
-  ELFAbsoluteAtom<ELFT> *createAbsoluteAtom(StringRef symName,
-                                            const Elf_Sym *sym, int64_t value) {
-    return new (_readerStorage)
-        ELFAbsoluteAtom<ELFT>(*this, symName, sym, value);
-  }
-
-  /// Returns true if the symbol is common symbol. A common symbol represents a
-  /// tentive definition in C. It has name, size and alignment constraint, but
-  /// actual storage has not yet been allocated. (The linker will allocate
-  /// storage for them in the later pass after coalescing tentative symbols by
-  /// name.)
-  virtual bool isCommonSymbol(const Elf_Sym *symbol) const {
-    return symbol->getType() == llvm::ELF::STT_COMMON ||
-           symbol->st_shndx == llvm::ELF::SHN_COMMON;
-  }
-
-  /// Returns true if the section is a gnulinkonce section.
-  bool isGnuLinkOnceSection(StringRef sectionName) const {
-    return sectionName.startswith(".gnu.linkonce.");
-  }
-
-  /// Returns true if the section is a COMDAT group section.
-  bool isGroupSection(const Elf_Shdr *shdr) const {
-    return (shdr->sh_type == llvm::ELF::SHT_GROUP);
-  }
-
-  /// Returns true if the section is a member of some group.
-  bool isSectionMemberOfGroup(const Elf_Shdr *shdr) const {
-    return (shdr->sh_flags & llvm::ELF::SHF_GROUP);
-  }
-
-  /// Returns correct st_value for the symbol depending on the architecture.
-  /// For most architectures it's just a regular st_value with no changes.
-  virtual uint64_t getSymbolValue(const Elf_Sym *symbol) const {
-    return symbol->st_value;
-  }
-
-  /// Returns initial addend
-  virtual Reference::Addend getInitialAddend(ArrayRef<uint8_t> symContent,
-                                  uint64_t symbolValue,
-                                  const Elf_Rel& reference) const {
-    return *(symContent.data() + reference.r_offset - symbolValue);
-  }
-
-  /// Process the common symbol and create an atom for it.
-  virtual ELFCommonAtom<ELFT> *createCommonAtom(StringRef symName,
-                                                const Elf_Sym *sym) {
-    return new (_readerStorage) ELFCommonAtom<ELFT>(*this, symName, sym);
-  }
-
-  /// Creates an atom for a given defined symbol.
-  virtual ELFDefinedAtom<ELFT> *
-  createDefinedAtom(StringRef symName, StringRef sectionName,
-                    const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
-                    ArrayRef<uint8_t> contentData, unsigned int referenceStart,
-                    unsigned int referenceEnd,
-                    std::vector<ELFReference<ELFT> *> &referenceList) {
-    return new (_readerStorage) ELFDefinedAtom<ELFT>(
-        *this, symName, sectionName, sym, sectionHdr, contentData,
-        referenceStart, referenceEnd, referenceList);
-  }
-
-  /// Process the Merge string and create an atom for it.
-  ELFMergeAtom<ELFT> *createMergedString(StringRef sectionName,
-                                         const Elf_Shdr *sectionHdr,
-                                         ArrayRef<uint8_t> contentData,
-                                         unsigned int offset) {
-    auto *mergeAtom = new (_readerStorage)
-        ELFMergeAtom<ELFT>(*this, sectionName, sectionHdr, contentData, offset);
-    const MergeSectionKey mergedSectionKey = {sectionHdr, offset};
-    if (_mergedSectionMap.find(mergedSectionKey) == _mergedSectionMap.end())
-      _mergedSectionMap.insert(std::make_pair(mergedSectionKey, mergeAtom));
-    return mergeAtom;
-  }
-
-  /// References to the sections comprising a group, from sections
-  /// outside the group, must be made via global UNDEF symbols,
-  /// referencing global symbols defined as addresses in the group
-  /// sections. They may not reference local symbols for addresses in
-  /// the group's sections, including section symbols.
-  /// ABI Doc : https://mentorembedded.github.io/cxx-abi/abi/prop-72-comdat.html
-  /// Does the atom need to be redirected using a separate undefined atom?
-  bool redirectReferenceUsingUndefAtom(const Elf_Sym *sourceSymbol,
-                                       const Elf_Sym *targetSymbol) const;
-
-  void addReferenceToSymbol(const ELFReference<ELFT> *r, const Elf_Sym *sym) {
-    _referenceToSymbol[r] = sym;
-  }
-
-  const Elf_Sym *findSymbolForReference(const ELFReference<ELFT> *r) const {
-    auto elfReferenceToSymbol = _referenceToSymbol.find(r);
-    if (elfReferenceToSymbol != _referenceToSymbol.end())
-      return elfReferenceToSymbol->second;
-    return nullptr;
-  }
-
-  llvm::BumpPtrAllocator _readerStorage;
-  std::unique_ptr<llvm::object::ELFFile<ELFT> > _objFile;
-  const Elf_Shdr *_symtab = nullptr;
-  ArrayRef<Elf_Word> _shndxTable;
-
-  /// \brief _relocationAddendReferences and _relocationReferences contain the
-  /// list of relocations references.  In ELF, if a section named, ".text" has
-  /// relocations will also have a section named ".rel.text" or ".rela.text"
-  /// which will hold the entries.
-  std::unordered_map<const Elf_Shdr *, range<const Elf_Rela *>>
-      _relocationAddendReferences;
-  MergedSectionMapT _mergedSectionMap;
-  std::unordered_map<const Elf_Shdr *, const Elf_Shdr *> _relocationReferences;
-  std::vector<ELFReference<ELFT> *> _references;
-  llvm::DenseMap<const Elf_Sym *, Atom *> _symbolToAtomMapping;
-  llvm::DenseMap<const ELFReference<ELFT> *, const Elf_Sym *>
-  _referenceToSymbol;
-  // Group child atoms have a pair corresponding to the signature and the
-  // section header of the section that was used for generating the signature.
-  llvm::DenseMap<const Elf_Sym *, std::pair<StringRef, const Elf_Shdr *>>
-      _groupChild;
-  llvm::StringMap<Atom *> _undefAtomsForGroupChild;
-
-  /// \brief Atoms that are created for a section that has the merge property
-  /// set
-  MergeAtomsT _mergeAtoms;
-
-  /// \brief the section and the symbols that are contained within it to create
-  /// used to create atoms
-  llvm::MapVector<const Elf_Shdr *, std::vector<const Elf_Sym *>>
-      _sectionSymbols;
-
-  /// \brief Sections that have merge string property
-  std::vector<const Elf_Shdr *> _mergeStringSections;
-
-  std::unique_ptr<MemoryBuffer> _mb;
-  int64_t _ordinal;
-
-  /// \brief the cached options relevant while reading the ELF File
-  bool _doStringsMerge;
-
-  /// \brief Is --wrap on?
-  bool _useWrap;
-
-  /// \brief The LinkingContext.
-  ELFLinkingContext &_ctx;
-
-  // Wrap map
-  llvm::StringMap<UndefinedAtom *> _wrapSymbolMap;
-};
-
-/// \brief All atoms are owned by a File. To add linker specific atoms
-/// the atoms need to be inserted to a file called (RuntimeFile) which
-/// are basically additional symbols required by libc and other runtime
-/// libraries part of executing a program. This class provides support
-/// for adding absolute symbols and undefined symbols
-template <class ELFT> class RuntimeFile : public ELFFile<ELFT> {
-public:
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-  RuntimeFile(ELFLinkingContext &ctx, StringRef name)
-      : ELFFile<ELFT>(name, ctx) {}
-
-  /// \brief add a global absolute atom
-  virtual void addAbsoluteAtom(StringRef symbolName, bool isHidden = false);
-
-  /// \brief add an undefined atom
-  virtual void addUndefinedAtom(StringRef symbolName);
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif // LLD_READER_WRITER_ELF_FILE_H
diff --git a/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
deleted file mode 100644
index 70d6d618207d..000000000000
--- a/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-//===- lib/ReaderWriter/ELF/ELFLinkingContext.cpp -------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "ELFFile.h"
-#include "OrderPass.h"
-#include "TargetHandler.h"
-#include "lld/Core/Instrumentation.h"
-#include "lld/Core/SharedLibraryFile.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Config/config.h"
-#include "llvm/Support/ELF.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-
-#if defined(HAVE_CXXABI_H)
-#include <cxxabi.h>
-#endif
-
-using llvm::sys::fs::exists;
-using llvm::sys::path::is_absolute;
-
-namespace lld {
-
-class CommandLineUndefinedAtom : public SimpleUndefinedAtom {
-public:
-  CommandLineUndefinedAtom(const File &f, StringRef name)
-      : SimpleUndefinedAtom(f, name) {}
-
-  CanBeNull canBeNull() const override {
-    return CanBeNull::canBeNullAtBuildtime;
-  }
-};
-
-void ELFLinkingContext::addPasses(PassManager &pm) {
-  pm.add(llvm::make_unique<elf::OrderPass>());
-}
-
-uint16_t ELFLinkingContext::getOutputMachine() const {
-  switch (getTriple().getArch()) {
-  case llvm::Triple::x86:
-    return llvm::ELF::EM_386;
-  case llvm::Triple::x86_64:
-    return llvm::ELF::EM_X86_64;
-  case llvm::Triple::hexagon:
-    return llvm::ELF::EM_HEXAGON;
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-    return llvm::ELF::EM_MIPS;
-  case llvm::Triple::aarch64:
-    return llvm::ELF::EM_AARCH64;
-  case llvm::Triple::arm:
-    return llvm::ELF::EM_ARM;
-  default:
-    llvm_unreachable("Unhandled arch");
-  }
-}
-
-StringRef ELFLinkingContext::entrySymbolName() const {
-  if (_outputELFType == llvm::ELF::ET_EXEC && _entrySymbolName.empty())
-    return "_start";
-  return _entrySymbolName;
-}
-
-bool ELFLinkingContext::validateImpl(raw_ostream &diagnostics) {
-  switch (outputFileType()) {
-  case LinkingContext::OutputFileType::YAML:
-    _writer = createWriterYAML(*this);
-    break;
-  default:
-    _writer = createWriterELF(*this);
-    break;
-  }
-
-  // If -dead_strip, set up initial live symbols.
-  if (deadStrip())
-    addDeadStripRoot(entrySymbolName());
-  return true;
-}
-
-bool ELFLinkingContext::isDynamic() const {
-  switch (_outputELFType) {
-  case llvm::ELF::ET_EXEC:
-    return !_isStaticExecutable;
-  case llvm::ELF::ET_DYN:
-    return true;
-  }
-  return false;
-}
-
-bool ELFLinkingContext::isRelativeReloc(const Reference &) const {
-  return false;
-}
-
-Writer &ELFLinkingContext::writer() const { return *_writer; }
-
-static void buildSearchPath(SmallString<128> &path, StringRef dir,
-                            StringRef sysRoot) {
-  if (dir.startswith("=/")) {
-    // If a search directory begins with "=", "=" is replaced
-    // with the sysroot path.
-    path.assign(sysRoot);
-    path.append(dir.substr(1));
-  } else {
-    path.assign(dir);
-  }
-}
-
-ErrorOr<StringRef> ELFLinkingContext::searchLibrary(StringRef libName) const {
-  bool hasColonPrefix = libName[0] == ':';
-  SmallString<128> path;
-  for (StringRef dir : _inputSearchPaths) {
-    // Search for dynamic library
-    if (!_isStaticExecutable) {
-      buildSearchPath(path, dir, _sysrootPath);
-      llvm::sys::path::append(path, hasColonPrefix
-                                        ? libName.drop_front()
-                                        : Twine("lib", libName) + ".so");
-      if (exists(path.str()))
-        return path.str().copy(_allocator);
-    }
-    // Search for static libraries too
-    buildSearchPath(path, dir, _sysrootPath);
-    llvm::sys::path::append(path, hasColonPrefix
-                                      ? libName.drop_front()
-                                      : Twine("lib", libName) + ".a");
-    if (exists(path.str()))
-      return path.str().copy(_allocator);
-  }
-  if (hasColonPrefix && exists(libName.drop_front()))
-      return libName.drop_front();
-
-  return make_error_code(llvm::errc::no_such_file_or_directory);
-}
-
-ErrorOr<StringRef> ELFLinkingContext::searchFile(StringRef fileName,
-                                                 bool isSysRooted) const {
-  SmallString<128> path;
-  if (is_absolute(fileName) && isSysRooted) {
-    path.assign(_sysrootPath);
-    path.append(fileName);
-    if (exists(path.str()))
-      return path.str().copy(_allocator);
-  } else if (exists(fileName)) {
-    return fileName;
-  }
-
-  if (is_absolute(fileName))
-    return make_error_code(llvm::errc::no_such_file_or_directory);
-
-  for (StringRef dir : _inputSearchPaths) {
-    buildSearchPath(path, dir, _sysrootPath);
-    llvm::sys::path::append(path, fileName);
-    if (exists(path.str()))
-      return path.str().copy(_allocator);
-  }
-  return make_error_code(llvm::errc::no_such_file_or_directory);
-}
-
-void ELFLinkingContext::createInternalFiles(
-    std::vector<std::unique_ptr<File>> &files) const {
-  std::unique_ptr<SimpleFile> file(
-      new SimpleFile("<internal file for --defsym>"));
-  for (auto &i : getAbsoluteSymbols()) {
-    StringRef sym = i.first;
-    uint64_t val = i.second;
-    file->addAtom(*(new (_allocator) SimpleAbsoluteAtom(
-        *file, sym, Atom::scopeGlobal, val)));
-  }
-  files.push_back(std::move(file));
-  LinkingContext::createInternalFiles(files);
-}
-
-void ELFLinkingContext::finalizeInputFiles() {
-  // Add virtual archive that resolves undefined symbols.
-  if (_resolver)
-    getNodes().push_back(llvm::make_unique<FileNode>(std::move(_resolver)));
-}
-
-std::unique_ptr<File> ELFLinkingContext::createUndefinedSymbolFile() const {
-  if (_initialUndefinedSymbols.empty())
-    return nullptr;
-  std::unique_ptr<SimpleFile> undefinedSymFile(
-      new SimpleFile("command line option -u"));
-  for (auto undefSymStr : _initialUndefinedSymbols)
-    undefinedSymFile->addAtom(*(new (_allocator) CommandLineUndefinedAtom(
-        *undefinedSymFile, undefSymStr)));
-  return std::move(undefinedSymFile);
-}
-
-void ELFLinkingContext::notifySymbolTableCoalesce(const Atom *existingAtom,
-                                                  const Atom *newAtom,
-                                                  bool &useNew) {
-  // First suppose that the `existingAtom` is defined
-  // and the `newAtom` is undefined.
-  auto *da = dyn_cast<DefinedAtom>(existingAtom);
-  auto *ua = dyn_cast<UndefinedAtom>(newAtom);
-  if (!da && !ua) {
-    // Then try to reverse the assumption.
-    da = dyn_cast<DefinedAtom>(newAtom);
-    ua = dyn_cast<UndefinedAtom>(existingAtom);
-  }
-
-  if (da && ua && da->scope() == Atom::scopeGlobal &&
-      isa<SharedLibraryFile>(ua->file()))
-    // If strong defined atom coalesces away an atom declared
-    // in the shared object the strong atom needs to be dynamically exported.
-    // Save its name.
-    _dynamicallyExportedSymbols.insert(ua->name());
-}
-
-std::string ELFLinkingContext::demangle(StringRef symbolName) const {
-#if defined(HAVE_CXXABI_H)
-  if (!demangleSymbols())
-    return symbolName;
-
-  // Only try to demangle symbols that look like C++ symbols
-  if (!symbolName.startswith("_Z"))
-    return symbolName;
-
-  SmallString<256> symBuff;
-  StringRef nullTermSym = Twine(symbolName).toNullTerminatedStringRef(symBuff);
-  const char *cstr = nullTermSym.data();
-  int status;
-  char *demangled = abi::__cxa_demangle(cstr, nullptr, nullptr, &status);
-  if (!demangled)
-    return symbolName;
-  std::string result(demangled);
-  // __cxa_demangle() always uses a malloc'ed buffer to return the result.
-  free(demangled);
-  return result;
-#else
-  return symbolName;
-#endif
-}
-
-void ELFLinkingContext::setUndefinesResolver(std::unique_ptr<File> resolver) {
-  assert(isa<ArchiveLibraryFile>(resolver.get()) && "Wrong resolver type");
-  _resolver = std::move(resolver);
-}
-
-void ELFLinkingContext::notifyInputSectionName(StringRef name) {
-  // Save sections names which can be represented as a C identifier.
-  if (name.find_first_not_of("0123456789"
-                             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                             "abcdefghijklmnopqrstuvwxyz"
-                             "_") == StringRef::npos) {
-    std::lock_guard<std::mutex> lock(_cidentMutex);
-    _cidentSections.insert(name);
-  }
-}
-
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/ELFReader.h b/lib/ReaderWriter/ELF/ELFReader.h
deleted file mode 100644
index 60af6dff9980..000000000000
--- a/lib/ReaderWriter/ELF/ELFReader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//===- lib/ReaderWriter/ELF/ELFReader.h -----------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_READER_H
-#define LLD_READER_WRITER_ELF_READER_H
-
-#include "DynamicFile.h"
-#include "ELFFile.h"
-#include "lld/Core/File.h"
-#include "lld/Core/Reader.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Object/ELF.h"
-
-namespace lld {
-namespace elf {
-
-template <typename FileT> class ELFReader : public Reader {
-public:
-  ELFReader(ELFLinkingContext &ctx) : _ctx(ctx) {}
-
-  bool canParse(file_magic magic, MemoryBufferRef mb) const override {
-    return FileT::canParse(magic);
-  }
-
-  ErrorOr<std::unique_ptr<File>>
-  loadFile(std::unique_ptr<MemoryBuffer> mb,
-           const class Registry &) const override {
-    if (std::error_code ec = FileT::isCompatible(mb->getMemBufferRef(), _ctx))
-      return ec;
-    std::unique_ptr<File> ret = llvm::make_unique<FileT>(std::move(mb), _ctx);
-    return std::move(ret);
-  }
-
-private:
-  ELFLinkingContext &_ctx;
-};
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_READER_H
diff --git a/lib/ReaderWriter/ELF/ExecutableWriter.h b/lib/ReaderWriter/ELF/ExecutableWriter.h
deleted file mode 100644
index 9d9f4d9ce0a5..000000000000
--- a/lib/ReaderWriter/ELF/ExecutableWriter.h
+++ /dev/null
@@ -1,157 +0,0 @@
-//===- lib/ReaderWriter/ELF/ExecutableWriter.h ----------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_EXECUTABLE_WRITER_H
-#define LLD_READER_WRITER_ELF_EXECUTABLE_WRITER_H
-
-#include "OutputELFWriter.h"
-
-namespace lld {
-namespace elf {
-using namespace llvm;
-using namespace llvm::object;
-
-//===----------------------------------------------------------------------===//
-//  ExecutableWriter Class
-//===----------------------------------------------------------------------===//
-template<class ELFT>
-class ExecutableWriter : public OutputELFWriter<ELFT> {
-public:
-  ExecutableWriter(ELFLinkingContext &ctx, TargetLayout<ELFT> &layout)
-      : OutputELFWriter<ELFT>(ctx, layout) {}
-
-protected:
-  void buildDynamicSymbolTable(const File &file) override;
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-  void finalizeDefaultAtomValues() override;
-  void createDefaultSections() override;
-
-  bool isNeededTagRequired(const SharedLibraryAtom *sla) const override {
-    return this->_layout.isCopied(sla);
-  }
-
-  unique_bump_ptr<InterpSection<ELFT>> _interpSection;
-
-private:
-  std::unique_ptr<RuntimeFile<ELFT>> createRuntimeFile();
-};
-
-//===----------------------------------------------------------------------===//
-//  ExecutableWriter
-//===----------------------------------------------------------------------===//
-template<class ELFT>
-void ExecutableWriter<ELFT>::buildDynamicSymbolTable(const File &file) {
-  for (auto sec : this->_layout.sections())
-    if (auto section = dyn_cast<AtomSection<ELFT>>(sec))
-      for (const auto &atom : section->atoms()) {
-        const DefinedAtom *da = dyn_cast<const DefinedAtom>(atom->_atom);
-        if (!da)
-          continue;
-        if (da->dynamicExport() != DefinedAtom::dynamicExportAlways &&
-            !this->_ctx.isDynamicallyExportedSymbol(da->name()) &&
-            !(this->_ctx.shouldExportDynamic() &&
-              da->scope() == Atom::Scope::scopeGlobal))
-          continue;
-        this->_dynamicSymbolTable->addSymbol(atom->_atom, section->ordinal(),
-                                             atom->_virtualAddr, atom);
-      }
-
-  // Put weak symbols in the dynamic symbol table.
-  if (this->_ctx.isDynamic()) {
-    for (const UndefinedAtom *a : file.undefined()) {
-      if (this->_layout.isReferencedByDefinedAtom(a) &&
-          a->canBeNull() != UndefinedAtom::canBeNullNever)
-        this->_dynamicSymbolTable->addSymbol(a, ELF::SHN_UNDEF);
-    }
-  }
-
-  OutputELFWriter<ELFT>::buildDynamicSymbolTable(file);
-}
-
-template<class ELFT>
-std::unique_ptr<RuntimeFile<ELFT>> ExecutableWriter<ELFT>::createRuntimeFile() {
-  auto file = llvm::make_unique<RuntimeFile<ELFT>>(this->_ctx, "C runtime");
-  file->addUndefinedAtom(this->_ctx.entrySymbolName());
-  file->addAbsoluteAtom("__bss_start");
-  file->addAbsoluteAtom("__bss_end");
-  file->addAbsoluteAtom("_end");
-  file->addAbsoluteAtom("end");
-  file->addAbsoluteAtom("__preinit_array_start", true);
-  file->addAbsoluteAtom("__preinit_array_end", true);
-  file->addAbsoluteAtom("__init_array_start", true);
-  file->addAbsoluteAtom("__init_array_end", true);
-  if (this->_ctx.isRelaOutputFormat()) {
-    file->addAbsoluteAtom("__rela_iplt_start");
-    file->addAbsoluteAtom("__rela_iplt_end");
-  } else {
-    file->addAbsoluteAtom("__rel_iplt_start");
-    file->addAbsoluteAtom("__rel_iplt_end");
-  }
-  file->addAbsoluteAtom("__fini_array_start", true);
-  file->addAbsoluteAtom("__fini_array_end", true);
-  return file;
-}
-
-/// \brief Hook in lld to add CRuntime file
-template <class ELFT>
-void ExecutableWriter<ELFT>::createImplicitFiles(
-    std::vector<std::unique_ptr<File> > &result) {
-  OutputELFWriter<ELFT>::createImplicitFiles(result);
-  result.push_back(createRuntimeFile());
-}
-
-template <class ELFT> void ExecutableWriter<ELFT>::createDefaultSections() {
-  OutputELFWriter<ELFT>::createDefaultSections();
-  if (this->_ctx.isDynamic()) {
-    _interpSection.reset(new (this->_alloc) InterpSection<ELFT>(
-        this->_ctx, ".interp", TargetLayout<ELFT>::ORDER_INTERP,
-        this->_ctx.getInterpreter()));
-    this->_layout.addSection(_interpSection.get());
-  }
-}
-
-/// Finalize the value of all the absolute symbols that we
-/// created
-template <class ELFT> void ExecutableWriter<ELFT>::finalizeDefaultAtomValues() {
-  OutputELFWriter<ELFT>::finalizeDefaultAtomValues();
-  AtomLayout *bssStartAtom = this->_layout.findAbsoluteAtom("__bss_start");
-  AtomLayout *bssEndAtom = this->_layout.findAbsoluteAtom("__bss_end");
-  AtomLayout *underScoreEndAtom = this->_layout.findAbsoluteAtom("_end");
-  AtomLayout *endAtom = this->_layout.findAbsoluteAtom("end");
-
-  assert((bssStartAtom || bssEndAtom || underScoreEndAtom || endAtom) &&
-         "Unable to find the absolute atoms that have been added by lld");
-
-  this->updateScopeAtomValues("preinit_array", ".preinit_array");
-  this->updateScopeAtomValues("init_array", ".init_array");
-  if (this->_ctx.isRelaOutputFormat())
-    this->updateScopeAtomValues("rela_iplt", ".rela.plt");
-  else
-    this->updateScopeAtomValues("rel_iplt", ".rel.plt");
-  this->updateScopeAtomValues("fini_array", ".fini_array");
-
-  auto bssSection = this->_layout.findOutputSection(".bss");
-
-  // If we don't find a bss section, then don't set these values
-  if (bssSection) {
-    bssStartAtom->_virtualAddr = bssSection->virtualAddr();
-    bssEndAtom->_virtualAddr =
-        bssSection->virtualAddr() + bssSection->memSize();
-    underScoreEndAtom->_virtualAddr = bssEndAtom->_virtualAddr;
-    endAtom->_virtualAddr = bssEndAtom->_virtualAddr;
-  } else if (auto dataSection = this->_layout.findOutputSection(".data")) {
-    underScoreEndAtom->_virtualAddr =
-        dataSection->virtualAddr() + dataSection->memSize();
-    endAtom->_virtualAddr = underScoreEndAtom->_virtualAddr;
-  }
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // LLD_READER_WRITER_ELF_EXECUTABLE_WRITER_H
diff --git a/lib/ReaderWriter/ELF/FileCommon.cpp b/lib/ReaderWriter/ELF/FileCommon.cpp
deleted file mode 100644
index c23e3f6656cd..000000000000
--- a/lib/ReaderWriter/ELF/FileCommon.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//===- lib/ReaderWriter/ELF/FileCommon.cpp --------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ELFFile.h"
-#include "FileCommon.h"
-
-using namespace llvm::ELF;
-
-namespace lld {
-namespace elf {
-
-static const char *elf32_expected = "ELF32 expected, but got ELF64";
-static const char *elf64_expected = "ELF64 expected, but got ELF32";
-static const char *le_expected =
-      "Little endian files are expected, but got a big endian file.";
-static const char *be_expected =
-      "Big endian files are expected, but got a little endian file.";
-
-template <>
-std::error_code checkCompatibility<ELF32LE>(unsigned char size,
-                                            unsigned char endian) {
-  if (size == ELFCLASS64)
-    return make_dynamic_error_code(elf32_expected);
-  if (endian == ELFDATA2MSB)
-    return make_dynamic_error_code(le_expected);
-  return std::error_code();
-}
-
-template <>
-std::error_code checkCompatibility<ELF32BE>(unsigned char size,
-                                            unsigned char endian) {
-  if (size == ELFCLASS64)
-    return make_dynamic_error_code(elf32_expected);
-  if (endian == ELFDATA2LSB)
-    return make_dynamic_error_code(be_expected);
-  return std::error_code();
-}
-
-template <>
-std::error_code checkCompatibility<ELF64LE>(unsigned char size,
-                                            unsigned char endian) {
-  if (size == ELFCLASS32)
-    return make_dynamic_error_code(elf64_expected);
-  if (endian == ELFDATA2MSB)
-    return make_dynamic_error_code(le_expected);
-  return std::error_code();
-}
-
-template <>
-std::error_code checkCompatibility<ELF64BE>(unsigned char size,
-                                            unsigned char endian) {
-  if (size == ELFCLASS32)
-    return make_dynamic_error_code(elf64_expected);
-  if (endian == ELFDATA2LSB)
-    return make_dynamic_error_code(be_expected);
-  return std::error_code();
-}
-
-} // end namespace elf
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/FileCommon.h b/lib/ReaderWriter/ELF/FileCommon.h
deleted file mode 100644
index eaff12afe72f..000000000000
--- a/lib/ReaderWriter/ELF/FileCommon.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- lib/ReaderWriter/ELF/FileCommon.h ----------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_FILE_COMMON_H
-#define LLD_READER_WRITER_ELF_FILE_COMMON_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/ELF.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT>
-std::error_code checkCompatibility(unsigned char size, unsigned char endian);
-
-template <typename ELFT>
-std::error_code isCompatible(MemoryBufferRef mb, ELFLinkingContext &ctx) {
-  typedef llvm::object::Elf_Ehdr_Impl<ELFT> Elf_Ehdr;
-
-  if (uintptr_t(mb.getBufferStart()) & 1)
-    return make_dynamic_error_code("invalid alignment");
-
-  auto *hdr = reinterpret_cast<const Elf_Ehdr *>(mb.getBuffer().data());
-  if (hdr->e_machine != ctx.getMachineType())
-    return make_dynamic_error_code("incompatible machine type");
-
-  unsigned char size;
-  unsigned char endian;
-  std::tie(size, endian) = llvm::object::getElfArchType(mb.getBuffer());
-  if (std::error_code ec = checkCompatibility<ELFT>(size, endian))
-    return ec;
-  return std::error_code();
-}
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/HeaderChunks.cpp b/lib/ReaderWriter/ELF/HeaderChunks.cpp
deleted file mode 100644
index 193937c18061..000000000000
--- a/lib/ReaderWriter/ELF/HeaderChunks.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-//===- lib/ReaderWriter/ELF/HeaderChunks.cpp --------------------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HeaderChunks.h"
-#include "TargetLayout.h"
-#include "llvm/ADT/STLExtras.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> void ELFHeader<ELFT>::finalize() {
-  _eh.e_ident[llvm::ELF::EI_CLASS] =
-      (ELFT::Is64Bits) ? llvm::ELF::ELFCLASS64 : llvm::ELF::ELFCLASS32;
-  _eh.e_ident[llvm::ELF::EI_DATA] =
-      (ELFT::TargetEndianness == llvm::support::little)
-          ? llvm::ELF::ELFDATA2LSB
-          : llvm::ELF::ELFDATA2MSB;
-  _eh.e_type = this->_ctx.getOutputELFType();
-  _eh.e_machine = this->_ctx.getOutputMachine();
-}
-
-template <class ELFT>
-ELFHeader<ELFT>::ELFHeader(const ELFLinkingContext &ctx)
-    : Chunk<ELFT>("elfhdr", Chunk<ELFT>::Kind::ELFHeader, ctx) {
-  this->_alignment = ELFT::Is64Bits ? 8 : 4;
-  this->_fsize = sizeof(Elf_Ehdr);
-  this->_msize = sizeof(Elf_Ehdr);
-  memset(_eh.e_ident, 0, llvm::ELF::EI_NIDENT);
-  e_ident(llvm::ELF::EI_MAG0, 0x7f);
-  e_ident(llvm::ELF::EI_MAG1, 'E');
-  e_ident(llvm::ELF::EI_MAG2, 'L');
-  e_ident(llvm::ELF::EI_MAG3, 'F');
-  e_ehsize(sizeof(Elf_Ehdr));
-  e_flags(0);
-}
-
-template <class ELFT>
-void ELFHeader<ELFT>::write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-                            llvm::FileOutputBuffer &buffer) {
-  uint8_t *chunkBuffer = buffer.getBufferStart();
-  uint8_t *atomContent = chunkBuffer + this->fileOffset();
-  memcpy(atomContent, &_eh, fileSize());
-}
-
-template <class ELFT>
-bool ProgramHeader<ELFT>::addSegment(Segment<ELFT> *segment) {
-  bool allocatedNew = false;
-  ELFLinkingContext::OutputMagic outputMagic = this->_ctx.getOutputMagic();
-  // For segments that are not a loadable segment, we
-  // just pick the values directly from the segment as there
-  // wouldnt be any slices within that
-  if (segment->segmentType() != llvm::ELF::PT_LOAD) {
-    Elf_Phdr *phdr = allocateProgramHeader(allocatedNew);
-    phdr->p_type = segment->segmentType();
-    phdr->p_offset = segment->fileOffset();
-    phdr->p_vaddr = segment->virtualAddr();
-    phdr->p_paddr = segment->virtualAddr();
-    phdr->p_filesz = segment->fileSize();
-    phdr->p_memsz = segment->memSize();
-    phdr->p_flags = segment->flags();
-    phdr->p_align = segment->alignment();
-    this->_fsize = fileSize();
-    this->_msize = this->_fsize;
-    return allocatedNew;
-  }
-  // For all other segments, use the slice
-  // to derive program headers
-  for (auto slice : segment->slices()) {
-    Elf_Phdr *phdr = allocateProgramHeader(allocatedNew);
-    phdr->p_type = segment->segmentType();
-    phdr->p_offset = slice->fileOffset();
-    phdr->p_vaddr = slice->virtualAddr();
-    phdr->p_paddr = slice->virtualAddr();
-    phdr->p_filesz = slice->fileSize();
-    phdr->p_memsz = slice->memSize();
-    phdr->p_flags = segment->flags();
-    phdr->p_align = slice->alignment();
-    uint64_t segPageSize = segment->pageSize();
-    uint64_t sliceAlign = slice->alignment();
-    // Alignment of PT_LOAD segments are set to the page size, but if the
-    // alignment of the slice is greater than the page size, set the alignment
-    // of the segment appropriately.
-    if (outputMagic != ELFLinkingContext::OutputMagic::NMAGIC &&
-        outputMagic != ELFLinkingContext::OutputMagic::OMAGIC) {
-      phdr->p_align =
-          (phdr->p_type == llvm::ELF::PT_LOAD)
-              ? (segPageSize < sliceAlign) ? sliceAlign : segPageSize
-              : sliceAlign;
-    } else
-      phdr->p_align = slice->alignment();
-  }
-  this->_fsize = fileSize();
-  this->_msize = this->_fsize;
-
-  return allocatedNew;
-}
-
-template <class ELFT>
-void ProgramHeader<ELFT>::write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-                                llvm::FileOutputBuffer &buffer) {
-  uint8_t *chunkBuffer = buffer.getBufferStart();
-  uint8_t *dest = chunkBuffer + this->fileOffset();
-  for (auto phi : _ph) {
-    memcpy(dest, phi, sizeof(Elf_Phdr));
-    dest += sizeof(Elf_Phdr);
-  }
-}
-
-template <class ELFT>
-typename ProgramHeader<ELFT>::Elf_Phdr *
-ProgramHeader<ELFT>::allocateProgramHeader(bool &allocatedNew) {
-  Elf_Phdr *phdr;
-  if (_phi == _ph.end()) {
-    phdr = new (_allocator) Elf_Phdr;
-    _ph.push_back(phdr);
-    _phi = _ph.end();
-    allocatedNew = true;
-  } else {
-    phdr = (*_phi);
-    ++_phi;
-  }
-  return phdr;
-}
-
-template <class ELFT>
-SectionHeader<ELFT>::SectionHeader(const ELFLinkingContext &ctx, int32_t order)
-    : Chunk<ELFT>("shdr", Chunk<ELFT>::Kind::SectionHeader, ctx) {
-  this->_fsize = 0;
-  this->_alignment = 8;
-  this->setOrder(order);
-  // The first element in the list is always NULL
-  auto *nullshdr = new (_sectionAllocate.Allocate<Elf_Shdr>()) Elf_Shdr;
-  ::memset(nullshdr, 0, sizeof(Elf_Shdr));
-  _sectionInfo.push_back(nullshdr);
-  this->_fsize += sizeof(Elf_Shdr);
-}
-
-template <class ELFT>
-void SectionHeader<ELFT>::appendSection(OutputSection<ELFT> *section) {
-  auto *shdr = new (_sectionAllocate.Allocate<Elf_Shdr>()) Elf_Shdr;
-  shdr->sh_name = _stringSection->addString(section->name());
-  shdr->sh_type = section->type();
-  shdr->sh_flags = section->flags();
-  shdr->sh_offset = section->fileOffset();
-  shdr->sh_addr = section->virtualAddr();
-  if (section->isLoadableSection())
-    shdr->sh_size = section->memSize();
-  else
-    shdr->sh_size = section->fileSize();
-  shdr->sh_link = section->link();
-  shdr->sh_info = section->shinfo();
-  shdr->sh_addralign = section->alignment();
-  shdr->sh_entsize = section->entsize();
-  _sectionInfo.push_back(shdr);
-}
-
-template <class ELFT>
-void SectionHeader<ELFT>::updateSection(Section<ELFT> *section) {
-  Elf_Shdr *shdr = _sectionInfo[section->ordinal()];
-  shdr->sh_type = section->getType();
-  shdr->sh_flags = section->getFlags();
-  shdr->sh_offset = section->fileOffset();
-  shdr->sh_addr = section->virtualAddr();
-  shdr->sh_size = section->fileSize();
-  shdr->sh_link = section->getLink();
-  shdr->sh_info = section->getInfo();
-  shdr->sh_addralign = section->alignment();
-  shdr->sh_entsize = section->getEntSize();
-}
-
-template <class ELFT>
-void SectionHeader<ELFT>::write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-                                llvm::FileOutputBuffer &buffer) {
-  uint8_t *chunkBuffer = buffer.getBufferStart();
-  uint8_t *dest = chunkBuffer + this->fileOffset();
-  for (auto shi : _sectionInfo) {
-    memcpy(dest, shi, sizeof(Elf_Shdr));
-    dest += sizeof(Elf_Shdr);
-  }
-  _stringSection->write(writer, layout, buffer);
-}
-
-template class ELFHeader<ELF32LE>;
-template class ELFHeader<ELF32BE>;
-template class ELFHeader<ELF64LE>;
-template class ELFHeader<ELF64BE>;
-
-template class ProgramHeader<ELF32LE>;
-template class ProgramHeader<ELF32BE>;
-template class ProgramHeader<ELF64LE>;
-template class ProgramHeader<ELF64BE>;
-
-template class SectionHeader<ELF32LE>;
-template class SectionHeader<ELF32BE>;
-template class SectionHeader<ELF64LE>;
-template class SectionHeader<ELF64BE>;
-
-} // end namespace elf
-} // end namespace lld
diff --git a/lib/ReaderWriter/ELF/HeaderChunks.h b/lib/ReaderWriter/ELF/HeaderChunks.h
deleted file mode 100644
index 51fbe38f1a00..000000000000
--- a/lib/ReaderWriter/ELF/HeaderChunks.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//===- lib/ReaderWriter/ELF/HeaderChunks.h --------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_HEADER_CHUNKS_H
-#define LLD_READER_WRITER_ELF_HEADER_CHUNKS_H
-
-#include "SegmentChunks.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/ELF.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/FileOutputBuffer.h"
-
-/// \brief An Header represents the Elf[32/64]_Ehdr structure at the
-///        start of an ELF executable file.
-namespace lld {
-namespace elf {
-
-template <class ELFT> class ELFHeader : public Chunk<ELFT> {
-public:
-  typedef llvm::object::Elf_Ehdr_Impl<ELFT> Elf_Ehdr;
-
-  ELFHeader(const ELFLinkingContext &);
-
-  void e_ident(int I, unsigned char C) { _eh.e_ident[I] = C; }
-  void e_type(uint16_t type)           { _eh.e_type = type; }
-  void e_machine(uint16_t machine)     { _eh.e_machine = machine; }
-  void e_version(uint32_t version)     { _eh.e_version = version; }
-  void e_entry(int64_t entry)          { _eh.e_entry = entry; }
-  void e_phoff(int64_t phoff)          { _eh.e_phoff = phoff; }
-  void e_shoff(int64_t shoff)          { _eh.e_shoff = shoff; }
-  void e_flags(uint32_t flags)         { _eh.e_flags = flags; }
-  void e_ehsize(uint16_t ehsize)       { _eh.e_ehsize = ehsize; }
-  void e_phentsize(uint16_t phentsize) { _eh.e_phentsize = phentsize; }
-  void e_phnum(uint16_t phnum)         { _eh.e_phnum = phnum; }
-  void e_shentsize(uint16_t shentsize) { _eh.e_shentsize = shentsize; }
-  void e_shnum(uint16_t shnum)         { _eh.e_shnum = shnum; }
-  void e_shstrndx(uint16_t shstrndx)   { _eh.e_shstrndx = shstrndx; }
-  uint64_t fileSize() const override { return sizeof(Elf_Ehdr); }
-
-  static bool classof(const Chunk<ELFT> *c) {
-    return c->kind() == Chunk<ELFT>::Kind::ELFHeader;
-  }
-
-  int getContentType() const override {
-    return Chunk<ELFT>::ContentType::Header;
-  }
-
-  void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-             llvm::FileOutputBuffer &buffer) override;
-
-  void finalize() override;
-
-private:
-  Elf_Ehdr _eh;
-};
-
-/// \brief An ProgramHeader represents the Elf[32/64]_Phdr structure at the
-///        start of an ELF executable file.
-template<class ELFT>
-class ProgramHeader : public Chunk<ELFT> {
-public:
-  typedef llvm::object::Elf_Phdr_Impl<ELFT> Elf_Phdr;
-  typedef typename std::vector<Elf_Phdr *>::iterator PhIterT;
-  typedef typename std::reverse_iterator<PhIterT> ReversePhIterT;
-
-  ProgramHeader(const ELFLinkingContext &ctx)
-      : Chunk<ELFT>("elfphdr", Chunk<ELFT>::Kind::ProgramHeader, ctx) {
-    this->_alignment = ELFT::Is64Bits ? 8 : 4;
-    resetProgramHeaders();
-  }
-
-  bool addSegment(Segment<ELFT> *segment);
-  void resetProgramHeaders() { _phi = _ph.begin(); }
-  uint64_t fileSize() const override { return sizeof(Elf_Phdr) * _ph.size(); }
-
-  static bool classof(const Chunk<ELFT> *c) {
-    return c->kind() == Chunk<ELFT>::Kind::ProgramHeader;
-  }
-
-  void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-             llvm::FileOutputBuffer &buffer) override;
-
-  PhIterT begin() { return _ph.begin(); }
-  PhIterT end() { return _ph.end(); }
-  ReversePhIterT rbegin() { return _ph.rbegin(); }
-  ReversePhIterT rend() { return _ph.rend(); }
-
-  int64_t entsize() { return sizeof(Elf_Phdr); }
-  int64_t numHeaders() { return _ph.size();  }
-
-  int getContentType() const override {
-    return Chunk<ELFT>::ContentType::Header;
-  }
-
-private:
-  Elf_Phdr *allocateProgramHeader(bool &allocatedNew);
-
-  std::vector<Elf_Phdr *> _ph;
-  PhIterT _phi;
-  llvm::BumpPtrAllocator _allocator;
-};
-
-/// \brief An SectionHeader represents the Elf[32/64]_Shdr structure
-/// at the end of the file
-template<class ELFT>
-class SectionHeader : public Chunk<ELFT> {
-public:
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-
-  SectionHeader(const ELFLinkingContext &, int32_t order);
-  void appendSection(OutputSection<ELFT> *section);
-  void updateSection(Section<ELFT> *section);
-
-  static bool classof(const Chunk<ELFT> *c) {
-    return c->kind() == Chunk<ELFT>::Kind::SectionHeader;
-  }
-
-  void setStringSection(StringTable<ELFT> *s) {
-    _stringSection = s;
-  }
-
-  void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
-             llvm::FileOutputBuffer &buffer) override;
-
-  uint64_t fileSize() const override {
-    return sizeof(Elf_Shdr) * _sectionInfo.size();
-  }
-
-  uint64_t entsize() { return sizeof(Elf_Shdr); }
-
-  int getContentType() const override {
-    return Chunk<ELFT>::ContentType::Header;
-  }
-
-  uint64_t numHeaders() { return _sectionInfo.size(); }
-
-private:
-  StringTable<ELFT> *_stringSection;
-  std::vector<Elf_Shdr *> _sectionInfo;
-  llvm::BumpPtrAllocator _sectionAllocate;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Hexagon/CMakeLists.txt b/lib/ReaderWriter/ELF/Hexagon/CMakeLists.txt
deleted file mode 100644
index e5c5cb77f38c..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_lld_library(lldHexagonELFTarget
-  HexagonLinkingContext.cpp
-  HexagonRelocationHandler.cpp
-  HexagonTargetHandler.cpp
-  LINK_LIBS
-    lldELF
-    lldReaderWriter
-    lldCore
-    LLVMObject
-    LLVMSupport
-  )
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h b/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h
deleted file mode 100644
index 84415b273f44..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h ---------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef HEXAGON_DYNAMIC_LIBRARY_WRITER_H
-#define HEXAGON_DYNAMIC_LIBRARY_WRITER_H
-
-#include "DynamicLibraryWriter.h"
-#include "HexagonLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-class HexagonTargetLayout;
-
-class HexagonDynamicLibraryWriter : public DynamicLibraryWriter<ELF32LE> {
-public:
-  HexagonDynamicLibraryWriter(HexagonLinkingContext &ctx,
-                              HexagonTargetLayout &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void finalizeDefaultAtomValues() override;
-
-  std::error_code setELFHeader() override {
-    DynamicLibraryWriter::setELFHeader();
-    setHexagonELFHeader(*_elfHeader);
-    return std::error_code();
-  }
-
-private:
-  HexagonLinkingContext &_ctx;
-  HexagonTargetLayout &_targetLayout;
-};
-
-HexagonDynamicLibraryWriter::HexagonDynamicLibraryWriter(
-    HexagonLinkingContext &ctx, HexagonTargetLayout &layout)
-    : DynamicLibraryWriter(ctx, layout), _ctx(ctx), _targetLayout(layout) {}
-
-void HexagonDynamicLibraryWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  DynamicLibraryWriter::createImplicitFiles(result);
-  // Add the default atoms as defined for hexagon
-  auto file =
-      llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "Hexagon runtime file");
-  file->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_");
-  file->addAbsoluteAtom("_DYNAMIC");
-  result.push_back(std::move(file));
-}
-
-void HexagonDynamicLibraryWriter::finalizeDefaultAtomValues() {
-  // Finalize the atom values that are part of the parent.
-  DynamicLibraryWriter::finalizeDefaultAtomValues();
-  if (_ctx.isDynamic())
-    finalizeHexagonRuntimeAtomValues(_targetLayout);
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // HEXAGON_DYNAMIC_LIBRARY_WRITER_H
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h b/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h
deleted file mode 100644
index 3d0d38f387dd..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h
+++ /dev/null
@@ -1,149 +0,0 @@
-//===- lib/ReaderWriter/ELF/HexagonELFFile.h ------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_ELF_FILE_H
-#define LLD_READER_WRITER_ELF_HEXAGON_ELF_FILE_H
-
-#include "ELFReader.h"
-#include "HexagonLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-class HexagonELFFile;
-
-class HexagonELFDefinedAtom : public ELFDefinedAtom<ELF32LE> {
-  typedef llvm::object::Elf_Sym_Impl<ELF32LE> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELF32LE> Elf_Shdr;
-
-public:
-  template <typename... T>
-  HexagonELFDefinedAtom(T &&... args)
-      : ELFDefinedAtom(std::forward<T>(args)...) {}
-
-  DefinedAtom::ContentType contentType() const override {
-    if (_contentType != DefinedAtom::typeUnknown)
-      return _contentType;
-    if (_section->sh_flags & llvm::ELF::SHF_HEX_GPREL) {
-      if (_section->sh_type == llvm::ELF::SHT_NOBITS)
-        return (_contentType = DefinedAtom::typeZeroFillFast);
-      return (_contentType = DefinedAtom::typeDataFast);
-    }
-    return ELFDefinedAtom::contentType();
-  }
-
-  DefinedAtom::ContentPermissions permissions() const override {
-    if (_section->sh_flags & llvm::ELF::SHF_HEX_GPREL)
-      return DefinedAtom::permRW_;
-    return ELFDefinedAtom::permissions();
-  }
-};
-
-class HexagonELFCommonAtom : public ELFCommonAtom<ELF32LE> {
-  typedef llvm::object::Elf_Sym_Impl<ELF32LE> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELF32LE> Elf_Shdr;
-
-public:
-  HexagonELFCommonAtom(const ELFFile<ELF32LE> &file, StringRef symbolName,
-                       const Elf_Sym *symbol)
-      : ELFCommonAtom(file, symbolName, symbol) {}
-
-  virtual bool isSmallCommonSymbol() const {
-    switch (_symbol->st_shndx) {
-    // Common symbols
-    case llvm::ELF::SHN_HEXAGON_SCOMMON:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_1:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_2:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_4:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_8:
-      return true;
-    default:
-      break;
-    }
-    return false;
-  }
-
-  uint64_t size() const override {
-    if (isSmallCommonSymbol())
-      return _symbol->st_size;
-    return ELFCommonAtom::size();
-  }
-
-  DefinedAtom::Merge merge() const override {
-    if (_symbol->getBinding() == llvm::ELF::STB_WEAK)
-      return DefinedAtom::mergeAsWeak;
-    if (isSmallCommonSymbol())
-      return DefinedAtom::mergeAsTentative;
-    return ELFCommonAtom::merge();
-  }
-
-  DefinedAtom::ContentType contentType() const override {
-    if (isSmallCommonSymbol())
-      return DefinedAtom::typeZeroFillFast;
-    return ELFCommonAtom::contentType();
-  }
-
-  DefinedAtom::Alignment alignment() const override {
-    if (isSmallCommonSymbol())
-      return DefinedAtom::Alignment(_symbol->st_value);
-    return 1;
-  }
-
-  DefinedAtom::ContentPermissions permissions() const override {
-    if (isSmallCommonSymbol())
-      return DefinedAtom::permRW_;
-    return ELFCommonAtom::permissions();
-  }
-};
-
-class HexagonELFFile : public ELFFile<ELF32LE> {
-  typedef llvm::object::Elf_Sym_Impl<ELF32LE> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELF32LE> Elf_Shdr;
-
-public:
-  HexagonELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx)
-      : ELFFile(std::move(mb), ctx) {}
-
-  bool isCommonSymbol(const Elf_Sym *symbol) const override {
-    switch (symbol->st_shndx) {
-    // Common symbols
-    case llvm::ELF::SHN_HEXAGON_SCOMMON:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_1:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_2:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_4:
-    case llvm::ELF::SHN_HEXAGON_SCOMMON_8:
-      return true;
-    default:
-      break;
-    }
-    return ELFFile::isCommonSymbol(symbol);
-  }
-
-  /// Process the Defined symbol and create an atom for it.
-  ELFDefinedAtom<ELF32LE> *createDefinedAtom(
-      StringRef symName, StringRef sectionName, const Elf_Sym *sym,
-      const Elf_Shdr *sectionHdr, ArrayRef<uint8_t> contentData,
-      unsigned int referenceStart, unsigned int referenceEnd,
-      std::vector<ELFReference<ELF32LE> *> &referenceList) override {
-    return new (_readerStorage) HexagonELFDefinedAtom(
-        *this, symName, sectionName, sym, sectionHdr, contentData,
-        referenceStart, referenceEnd, referenceList);
-  }
-
-  /// Process the Common symbol and create an atom for it.
-  ELFCommonAtom<ELF32LE> *createCommonAtom(StringRef symName,
-                                           const Elf_Sym *sym) override {
-    return new (_readerStorage) HexagonELFCommonAtom(*this, symName, sym);
-  }
-};
-
-} // elf
-} // lld
-
-#endif // LLD_READER_WRITER_ELF_HEXAGON_ELF_FILE_H
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonEncodings.h b/lib/ReaderWriter/ELF/Hexagon/HexagonEncodings.h
deleted file mode 100644
index 6af43d88afbb..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonEncodings.h
+++ /dev/null
@@ -1,638 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonEncodings.h -------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/ErrorHandling.h"
-
-namespace lld {
-namespace elf {
-
-/// \brief Applying fixup on Hexagon requires the relocator to fetch the fixup
-/// mask from the instruction. To fetch the fixup encoding, the linker uses a
-/// static array that contains the instruction mask, the compare mask and the
-/// relocation mask.
-typedef struct {
-  uint32_t insnMask;    // Instruction mask.
-  uint32_t insnCmpMask; // Compare mask.
-  uint32_t insnBitMask; // Relocation mask.
-  bool isDuplex;        // Indicates if the instruction is a duplex instruction.
-} Instruction;
-
-Instruction insn_encodings[] = {
-  // InsnMask   CompareMask BitMask IsDuplexInstruction
-  { 0xffe00004, 0x40000000, 0x20f8, 0x0 },
-  { 0xffe03080, 0x9ca03080, 0xf60, 0x0 },
-  { 0xf9e00000, 0x48c00000, 0x61f20ff, 0x0 },
-  { 0xf7c02300, 0x13802100, 0x3000fe, 0x0 },
-  { 0xffe00000, 0x60c00000, 0x1f18, 0x0 },
-  { 0xffe00000, 0x69c00000, 0x1f18, 0x0 },
-  { 0xffe02000, 0x43000000, 0x7e0, 0x0 },
-  { 0xff602060, 0x3e000060, 0x1f80, 0x0 },
-  { 0xffe03000, 0x9ae01000, 0xf60, 0x0 },
-  { 0xf9e00000, 0x91600000, 0x6003fe0, 0x0 },
-  { 0xffe02084, 0xaf000084, 0x30078, 0x0 },
-  { 0xff602060, 0x3e000020, 0x1f80, 0x0 },
-  { 0xff602060, 0x3e200040, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x10c02000, 0x3000fe, 0x0 },
-  { 0xffe00000, 0x60200000, 0x1f18, 0x0 },
-  { 0xffe00000, 0x69200000, 0x1f18, 0x0 },
-  { 0xffe038c0, 0xada00880, 0x3f, 0x0 },
-  { 0xff602000, 0x73002000, 0x1fe0, 0x0 },
-  { 0xf7c02000, 0x26c02000, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9f403880, 0x1f0100, 0x0 },
-  { 0xf9e00000, 0x48400000, 0x61f20ff, 0x0 },
-  { 0xffe02000, 0x41600000, 0x7e0, 0x0 },
-  { 0xffe02084, 0xaf000080, 0x30078, 0x0 },
-  { 0xf7c02300, 0x13800100, 0x3000fe, 0x0 },
-  { 0xffe01804, 0x46a00000, 0x20f8, 0x0 },
-  { 0xffe00004, 0x42400000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x22400000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x12402000, 0x3000fe, 0x0 },
-  { 0xfc003d18, 0x28003c18, 0x3f00000, 0x1 },
-  { 0xffe00000, 0x39000000, 0x201f, 0x0 },
-  { 0xff601018, 0xdd400008, 0xfe0, 0x0 },
-  { 0xffc0001c, 0x75400000, 0x203fe0, 0x0 },
-  { 0xfc003fc7, 0x48003f47, 0x3f00000, 0x1 },
-  { 0xffe03080, 0x9ca03000, 0xf60, 0x0 },
-  { 0xf9e00000, 0x90800000, 0x6003fe0, 0x0 },
-  { 0xf8003fc7, 0x40003fc4, 0x7f00000, 0x1 },
-  { 0xfc003e00, 0x68003c00, 0x3f00000, 0x1 },
-  { 0xf8003fc7, 0x40003fc5, 0x7f00000, 0x1 },
-  { 0xf9e00000, 0x91800000, 0x6003fe0, 0x0 },
-  { 0xff602060, 0x3e400060, 0x1f80, 0x0 },
-  { 0xff602060, 0x3e000000, 0x1f80, 0x0 },
-  { 0xf8003d18, 0x20003c18, 0x7f00000, 0x1 },
-  { 0xf8003f00, 0x20003800, 0x7f00000, 0x1 },
-  { 0xf8003d18, 0x20003c10, 0x7f00000, 0x1 },
-  { 0xff602000, 0x73602000, 0x1fe0, 0x0 },
-  { 0xffe03880, 0x9f002080, 0x1f0100, 0x0 },
-  { 0xffe02000, 0x47000000, 0x7e0, 0x0 },
-  { 0xf9e00000, 0x91400000, 0x6003fe0, 0x0 },
-  { 0xffe02080, 0xabc00080, 0x3f, 0x0 },
-  { 0xf7c02000, 0x20802000, 0x3000fe, 0x0 },
-  { 0xf8003fc7, 0x40003f44, 0x7f00000, 0x1 },
-  { 0xffe03884, 0xafa03084, 0x30078, 0x0 },
-  { 0xffe03000, 0x9b001000, 0xf60, 0x0 },
-  { 0xffe01804, 0x42a00800, 0x20f8, 0x0 },
-  { 0xfc003f00, 0x28003100, 0x3f00000, 0x1 },
-  { 0xffe02080, 0xab800080, 0x3f, 0x0 },
-  { 0xf7c02000, 0x24c00000, 0x3000fe, 0x0 },
-  { 0xffe00000, 0x39a00000, 0x201f, 0x0 },
-  { 0xf7c02300, 0x13802300, 0x3000fe, 0x0 },
-  { 0xffe01804, 0x46a00800, 0x20f8, 0x0 },
-  { 0xffe020c0, 0xad602080, 0x3f, 0x0 },
-  { 0xfc003f00, 0x28003500, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x28003400, 0x3f00000, 0x1 },
-  { 0xffe020c0, 0xad6000c0, 0x3f, 0x0 },
-  { 0xffe00000, 0x60000000, 0x1f18, 0x0 },
-  { 0xf8003000, 0x40000000, 0x7f00000, 0x1 },
-  { 0xffe00000, 0x69000000, 0x1f18, 0x0 },
-  { 0xffe03080, 0x9c601080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9ce01000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9c601000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x13402000, 0x3000fe, 0x0 },
-  { 0xffe03080, 0x9c603000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x21c00000, 0x3000fe, 0x0 },
-  { 0xfc003000, 0x68000000, 0x3f00000, 0x1 },
-  { 0xf8003800, 0x60002000, 0x7f00000, 0x1 },
-  { 0xffe02084, 0xaf802084, 0x30078, 0x0 },
-  { 0xfc003000, 0x48000000, 0x3f00000, 0x1 },
-  { 0xf7c02300, 0x11c02100, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x12800000, 0x3000fe, 0x0 },
-  { 0xfc003e70, 0x28003a40, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x28003300, 0x3f00000, 0x1 },
-  { 0xff800000, 0xe0000000, 0x1fe0, 0x0 },
-  { 0xff602060, 0x3f400000, 0x1f80, 0x0 },
-  { 0xffe00004, 0x42000000, 0x20f8, 0x0 },
-  { 0xf8003f00, 0x60003300, 0x7f00000, 0x1 },
-  { 0xffe01804, 0x42a00000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x12c00000, 0x3000fe, 0x0 },
-  { 0xf0000000, 0x0, 0xfff3fff, 0x0 },
-  { 0xff000016, 0xde000016, 0xe020e8, 0x0 },
-  { 0xffe03000, 0x9b201000, 0xf60, 0x0 },
-  { 0xffe03880, 0xaba00880, 0x3f, 0x0 },
-  { 0xf8003e00, 0x40003c00, 0x7f00000, 0x1 },
-  { 0xff602060, 0x3f200040, 0x1f80, 0x0 },
-  { 0xffe03880, 0x9f203880, 0x1f0100, 0x0 },
-  { 0xf7c02000, 0x20c00000, 0x3000fe, 0x0 },
-  { 0xf9e01800, 0x48a00800, 0x61f20ff, 0x0 },
-  { 0xf9e00000, 0x90a00000, 0x6003fe0, 0x0 },
-  { 0xff802000, 0x74802000, 0x1fe0, 0x0 },
-  { 0xffe03000, 0x9a401000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x10002000, 0x3000fe, 0x0 },
-  { 0xf7c03000, 0x14803000, 0x3000fe, 0x0 },
-  { 0xffe020c0, 0xad0020c0, 0x3f, 0x0 },
-  { 0xffe0001c, 0x75800000, 0x3fe0, 0x0 },
-  { 0xf9e01800, 0x48a01000, 0x61f20ff, 0x0 },
-  { 0xffe03080, 0x9dc03000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9dc03080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9dc01000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9dc01080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d601000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d601080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d603000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d603080, 0xf60, 0x0 },
-  { 0xfc003e00, 0x48003c00, 0x3f00000, 0x1 },
-  { 0xffe02084, 0xaf402084, 0x30078, 0x0 },
-  { 0xffe00004, 0x46600000, 0x20f8, 0x0 },
-  { 0xffe03880, 0x9f203080, 0x1f0100, 0x0 },
-  { 0xf8003f00, 0x20003100, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x11402000, 0x3000fe, 0x0 },
-  { 0xf8003d08, 0x20003d00, 0x7f00000, 0x1 },
-  { 0xffe03080, 0x9ca01080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9ca01000, 0xf60, 0x0 },
-  { 0xffe00000, 0x38a00000, 0x201f, 0x0 },
-  { 0xf7c02300, 0x11800000, 0x3000fe, 0x0 },
-  { 0xf7c02300, 0x13c02300, 0x3000fe, 0x0 },
-  { 0xffe03080, 0x9ce03000, 0xf60, 0x0 },
-  { 0xf9e00000, 0x90e00000, 0x6003fe0, 0x0 },
-  { 0xffe02084, 0xaf400080, 0x30078, 0x0 },
-  { 0xffe03080, 0x9ce03080, 0xf60, 0x0 },
-  { 0xff000000, 0x78000000, 0xdf3fe0, 0x0 },
-  { 0xffe03080, 0x9ce01080, 0xf60, 0x0 },
-  { 0xffe03880, 0xaba01080, 0x3f, 0x0 },
-  { 0xffe020c0, 0xad002080, 0x3f, 0x0 },
-  { 0xffe020c0, 0xad0000c0, 0x3f, 0x0 },
-  { 0xffe020c0, 0xad000080, 0x3f, 0x0 },
-  { 0xf7c02000, 0x25000000, 0x3000fe, 0x0 },
-  { 0xff602060, 0x3f200020, 0x1f80, 0x0 },
-  { 0xffe02084, 0xafc00084, 0x30078, 0x0 },
-  { 0xf7c02000, 0x24400000, 0x3000fe, 0x0 },
-  { 0xfc003000, 0x48001000, 0x3f00000, 0x1 },
-  { 0xf9e01800, 0xa1a01000, 0x60020ff, 0x0 },
-  { 0xff602060, 0x3f000040, 0x1f80, 0x0 },
-  { 0xffe02084, 0xaf602084, 0x30078, 0x0 },
-  { 0xf8003f00, 0x20003400, 0x7f00000, 0x1 },
-  { 0xffe02084, 0xaf400084, 0x30078, 0x0 },
-  { 0xffe01804, 0x44a01000, 0x20f8, 0x0 },
-  { 0xff602060, 0x3e200000, 0x1f80, 0x0 },
-  { 0xf8003e70, 0x20003a70, 0x7f00000, 0x1 },
-  { 0xf8003f00, 0x40003e00, 0x7f00000, 0x1 },
-  { 0xf8003f00, 0x20003300, 0x7f00000, 0x1 },
-  { 0xf7c02300, 0x13800300, 0x3000fe, 0x0 },
-  { 0xffe038c0, 0xada00080, 0x3f, 0x0 },
-  { 0xf9e00000, 0x49400000, 0x61f3fe0, 0x0 },
-  { 0xf8003800, 0x40002800, 0x7f00000, 0x1 },
-  { 0xffe038c0, 0xada020c0, 0x3f, 0x0 },
-  { 0xffe03884, 0xafa00880, 0x30078, 0x0 },
-  { 0xf9e00000, 0x49000000, 0x61f3fe0, 0x0 },
-  { 0xff800000, 0xd7000000, 0x6020e0, 0x0 },
-  { 0xffc00000, 0xda000000, 0x203fe0, 0x0 },
-  { 0xf7c02000, 0x12802000, 0x3000fe, 0x0 },
-  { 0xf9e00000, 0x49600000, 0x61f3fe0, 0x0 },
-  { 0xffe02000, 0x47400000, 0x7e0, 0x0 },
-  { 0xf9e00000, 0x49c00000, 0x61f3fe0, 0x0 },
-  { 0xffe03000, 0x9bc01000, 0xf60, 0x0 },
-  { 0xf7c02300, 0x13c00100, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9f002880, 0x1f0100, 0x0 },
-  { 0xffe03000, 0x9b601000, 0xf60, 0x0 },
-  { 0xffe01804, 0x40a00800, 0x20f8, 0x0 },
-  { 0xffe00004, 0x42800000, 0x20f8, 0x0 },
-  { 0xf7c03000, 0x14800000, 0x3000fe, 0x0 },
-  { 0xfc003000, 0x68001000, 0x3f00000, 0x1 },
-  { 0xfc003fc7, 0x48003f44, 0x3f00000, 0x1 },
-  { 0xfc003fc7, 0x48003f45, 0x3f00000, 0x1 },
-  { 0xf7c02000, 0x10800000, 0x3000fe, 0x0 },
-  { 0xf8003e70, 0x20003a50, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x21002000, 0x3000fe, 0x0 },
-  { 0xf8003fc4, 0x40003fc0, 0x7f00000, 0x1 },
-  { 0xf9e00000, 0x48000000, 0x61f20ff, 0x0 },
-  { 0xffc0001c, 0x75000010, 0x203fe0, 0x0 },
-  { 0xf8003f00, 0x20003800, 0x7f00000, 0x1 },
-  { 0xf9e00000, 0xa1800000, 0x60020ff, 0x0 },
-  { 0xffc01000, 0x61c00000, 0x202ffe, 0x0 },
-  { 0xffe02084, 0xaf402080, 0x30078, 0x0 },
-  { 0xffe03880, 0x9f602880, 0x1f0100, 0x0 },
-  { 0xfc003f00, 0x68003000, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x68003100, 0x3f00000, 0x1 },
-  { 0xff602060, 0x3f200000, 0x1f80, 0x0 },
-  { 0xffe03000, 0x9a801000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x24802000, 0x3000fe, 0x0 },
-  { 0xffe00004, 0x42c00000, 0x20f8, 0x0 },
-  { 0xf7c02300, 0x11802000, 0x3000fe, 0x0 },
-  { 0xffc01000, 0x61401000, 0x202ffe, 0x0 },
-  { 0xffe02000, 0x43c00000, 0x7e0, 0x0 },
-  { 0xf7c02000, 0x11400000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x21800000, 0x3000fe, 0x0 },
-  { 0xfc003c00, 0x28002c00, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x28003200, 0x3f00000, 0x1 },
-  { 0xffe03080, 0x9c803080, 0xf60, 0x0 },
-  { 0xf7c03000, 0x14c03000, 0x3000fe, 0x0 },
-  { 0xff800000, 0xdb800000, 0x6020e0, 0x0 },
-  { 0xf7c02000, 0x22402000, 0x3000fe, 0x0 },
-  { 0xffe00004, 0x46800000, 0x20f8, 0x0 },
-  { 0xffe00000, 0x69a00000, 0x1f18, 0x0 },
-  { 0xfc003e00, 0x68002a00, 0x3f00000, 0x1 },
-  { 0xffe00000, 0x60a00000, 0x1f18, 0x0 },
-  { 0xf7c02000, 0x25400000, 0x3000fe, 0x0 },
-  { 0xfc003e70, 0x28003a70, 0x3f00000, 0x1 },
-  { 0xffe03080, 0x9c803000, 0xf60, 0x0 },
-  { 0xffc01000, 0x61400000, 0x202ffe, 0x0 },
-  { 0xffe01804, 0x42a01000, 0x20f8, 0x0 },
-  { 0xffc0001c, 0x75000000, 0x203fe0, 0x0 },
-  { 0xffe02084, 0xafc02080, 0x30078, 0x0 },
-  { 0xffe03884, 0xafa00884, 0x30078, 0x0 },
-  { 0xffe03884, 0xafa02080, 0x30078, 0x0 },
-  { 0xffe00000, 0x38c00000, 0x201f, 0x0 },
-  { 0xffc01000, 0x61001000, 0x202ffe, 0x0 },
-  { 0xf9e00000, 0x48800000, 0x61f20ff, 0x0 },
-  { 0xf8003800, 0x40003000, 0x7f00000, 0x1 },
-  { 0xf7c03000, 0x15403000, 0x3000fe, 0x0 },
-  { 0xf7c03000, 0x15400000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x21000000, 0x3000fe, 0x0 },
-  { 0xffe00004, 0x40c00000, 0x20f8, 0x0 },
-  { 0xffe01804, 0x46a01000, 0x20f8, 0x0 },
-  { 0xf8003d08, 0x20003d08, 0x7f00000, 0x1 },
-  { 0xffe038c0, 0xada02080, 0x3f, 0x0 },
-  { 0xffe03080, 0x9c203000, 0xf60, 0x0 },
-  { 0xfc003800, 0x68002000, 0x3f00000, 0x1 },
-  { 0xf9e00000, 0x90600000, 0x6003fe0, 0x0 },
-  { 0xf7c03000, 0x14000000, 0x3000fe, 0x0 },
-  { 0xf8003e70, 0x20003a40, 0x7f00000, 0x1 },
-  { 0xff201800, 0x5c000800, 0xdf20fe, 0x0 },
-  { 0xffe02000, 0x41800000, 0x7e0, 0x0 },
-  { 0xff800000, 0xdb000000, 0x6020e0, 0x0 },
-  { 0xfc003f00, 0x48003e00, 0x3f00000, 0x1 },
-  { 0xf7c03000, 0x14002000, 0x3000fe, 0x0 },
-  { 0xf7c02300, 0x11800100, 0x3000fe, 0x0 },
-  { 0xfc003e00, 0x68002800, 0x3f00000, 0x1 },
-  { 0xffe00004, 0x44c00000, 0x20f8, 0x0 },
-  { 0xffe03880, 0x9f003880, 0x1f0100, 0x0 },
-  { 0xff602000, 0x73402000, 0x1fe0, 0x0 },
-  { 0xffe00000, 0x38200000, 0x201f, 0x0 },
-  { 0xf7c02000, 0x24800000, 0x3000fe, 0x0 },
-  { 0xf7c03000, 0x15001000, 0x3000fe, 0x0 },
-  { 0xff800000, 0x7c800000, 0x1f2000, 0x0 },
-  { 0xf8003fc7, 0x40003fc6, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x12000000, 0x3000fe, 0x0 },
-  { 0xff602000, 0x73202000, 0x1fe0, 0x0 },
-  { 0xf7c02300, 0x13c00000, 0x3000fe, 0x0 },
-  { 0xff602060, 0x3f400040, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x24002000, 0x3000fe, 0x0 },
-  { 0xffe02084, 0xaf800080, 0x30078, 0x0 },
-  { 0xffe00000, 0x38800000, 0x201f, 0x0 },
-  { 0xfc003f00, 0x28003800, 0x3f00000, 0x1 },
-  { 0xffe03080, 0x9c801080, 0xf60, 0x0 },
-  { 0xffe020c0, 0xad4000c0, 0x3f, 0x0 },
-  { 0xffe00000, 0x39400000, 0x201f, 0x0 },
-  { 0xf7c02300, 0x13c02100, 0x3000fe, 0x0 },
-  { 0xffe020c0, 0xad400080, 0x3f, 0x0 },
-  { 0xffe03880, 0x9f603880, 0x1f0100, 0x0 },
-  { 0xff000016, 0xde000002, 0xe020e8, 0x0 },
-  { 0xfc003d08, 0x28003d00, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x28003000, 0x3f00000, 0x1 },
-  { 0xffe03080, 0x9c401000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x21402000, 0x3000fe, 0x0 },
-  { 0xff201800, 0x5c200800, 0xdf20fe, 0x0 },
-  { 0xffe01804, 0x40a01000, 0x20f8, 0x0 },
-  { 0xfc003f00, 0x68003300, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x68003200, 0x3f00000, 0x1 },
-  { 0xf7c03000, 0x15401000, 0x3000fe, 0x0 },
-  { 0xffe01804, 0x44a00800, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x26000000, 0x3000fe, 0x0 },
-  { 0xffc00000, 0xda400000, 0x203fe0, 0x0 },
-  { 0xffe00004, 0x40600000, 0x20f8, 0x0 },
-  { 0xffe02080, 0xab600080, 0x3f, 0x0 },
-  { 0xf8003f00, 0x20003600, 0x7f00000, 0x1 },
-  { 0xf7c02300, 0x11c00300, 0x3000fe, 0x0 },
-  { 0xf8003f00, 0x20003700, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x25c00000, 0x3000fe, 0x0 },
-  { 0xf7c02300, 0x11800300, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9f802880, 0x1f0100, 0x0 },
-  { 0xfc003800, 0x48003000, 0x3f00000, 0x1 },
-  { 0xf8003c00, 0x20002c00, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x10400000, 0x3000fe, 0x0 },
-  { 0xff602060, 0x3f400060, 0x1f80, 0x0 },
-  { 0xffe03080, 0x9c801000, 0xf60, 0x0 },
-  { 0xff602060, 0x3e400040, 0x1f80, 0x0 },
-  { 0xf7c03000, 0x14402000, 0x3000fe, 0x0 },
-  { 0xffe0001c, 0x75800010, 0x3fe0, 0x0 },
-  { 0xff000016, 0xde000014, 0xe020e8, 0x0 },
-  { 0xf7c02300, 0x11c02000, 0x3000fe, 0x0 },
-  { 0xff600018, 0xdd200008, 0x1fe0, 0x0 },
-  { 0xff602060, 0x3e200060, 0x1f80, 0x0 },
-  { 0xff000016, 0xde000006, 0xe020e8, 0x0 },
-  { 0xffe00004, 0x44600000, 0x20f8, 0x0 },
-  { 0xf8003e00, 0x60002800, 0x7f00000, 0x1 },
-  { 0xfe600000, 0x3c000000, 0x207f, 0x0 },
-  { 0xffe03884, 0xafa02884, 0x30078, 0x0 },
-  { 0xf7c02300, 0x11802300, 0x3000fe, 0x0 },
-  { 0xffe00000, 0x38000000, 0x201f, 0x0 },
-  { 0xff200800, 0x5c000000, 0xdf20fe, 0x0 },
-  { 0xf7c02000, 0x13400000, 0x3000fe, 0x0 },
-  { 0xff200800, 0x5c200000, 0xdf20fe, 0x0 },
-  { 0xffe02000, 0x41000000, 0x7e0, 0x0 },
-  { 0xffe03880, 0x9fc02880, 0x1f0100, 0x0 },
-  { 0xffe00004, 0x46000000, 0x20f8, 0x0 },
-  { 0xff602060, 0x3f000020, 0x1f80, 0x0 },
-  { 0xfc003d08, 0x28003d08, 0x3f00000, 0x1 },
-  { 0xff602060, 0x3f200060, 0x1f80, 0x0 },
-  { 0xffe038c0, 0xada028c0, 0x3f, 0x0 },
-  { 0xffe038c0, 0xada008c0, 0x3f, 0x0 },
-  { 0xf8003f00, 0x20003500, 0x7f00000, 0x1 },
-  { 0xfc003fc4, 0x48003f40, 0x3f00000, 0x1 },
-  { 0xf9e01800, 0x48a00000, 0x61f20ff, 0x0 },
-  { 0xf7c03000, 0x14802000, 0x3000fe, 0x0 },
-  { 0xfc003f00, 0x28003900, 0x3f00000, 0x1 },
-  { 0xf8003fc7, 0x40003fc7, 0x7f00000, 0x1 },
-  { 0xffe02000, 0x45400000, 0x7e0, 0x0 },
-  { 0xffe038c0, 0xada02880, 0x3f, 0x0 },
-  { 0xffe02084, 0xaf002080, 0x30078, 0x0 },
-  { 0xffe03880, 0x9f803880, 0x1f0100, 0x0 },
-  { 0xf7c03000, 0x15000000, 0x3000fe, 0x0 },
-  { 0xfc003f00, 0x28003700, 0x3f00000, 0x1 },
-  { 0xfc003f00, 0x28003600, 0x3f00000, 0x1 },
-  { 0xffe02000, 0x47200000, 0x7e0, 0x0 },
-  { 0xffe03880, 0xaba00080, 0x3f, 0x0 },
-  { 0xffe02084, 0xafc00080, 0x30078, 0x0 },
-  { 0xff802000, 0x73800000, 0x1fe0, 0x0 },
-  { 0xffe03880, 0x9f202880, 0x1f0100, 0x0 },
-  { 0xf8003d18, 0x20003c00, 0x7f00000, 0x1 },
-  { 0xf9e00000, 0xa1600000, 0x60020ff, 0x0 },
-  { 0xffe00004, 0x44800000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x21802000, 0x3000fe, 0x0 },
-  { 0xff000000, 0xd8000000, 0x6020e0, 0x0 },
-  { 0xf9e00000, 0xa1000000, 0x60020ff, 0x0 },
-  { 0xffe03884, 0xafa00084, 0x30078, 0x0 },
-  { 0xff201800, 0x5c201800, 0xdf20fe, 0x0 },
-  { 0xff000016, 0xde000010, 0xe020e8, 0x0 },
-  { 0xffe03880, 0x9f603080, 0x1f0100, 0x0 },
-  { 0xffe02000, 0x41c00000, 0x7e0, 0x0 },
-  { 0xf7c02000, 0x20402000, 0x3000fe, 0x0 },
-  { 0xff800000, 0xe1000000, 0x1fe0, 0x0 },
-  { 0xf9e00000, 0xa1400000, 0x60020ff, 0x0 },
-  { 0xf7c03000, 0x14c00000, 0x3000fe, 0x0 },
-  { 0xf8003fc7, 0x40003f47, 0x7f00000, 0x1 },
-  { 0xffe00004, 0x40800000, 0x20f8, 0x0 },
-  { 0xff800000, 0xe1800000, 0x1fe0, 0x0 },
-  { 0xf7c02300, 0x11802100, 0x3000fe, 0x0 },
-  { 0xf9e00000, 0x49800000, 0x61f3fe0, 0x0 },
-  { 0xf7c02000, 0x26400000, 0x3000fe, 0x0 },
-  { 0xf8003c00, 0x20002800, 0x7f00000, 0x1 },
-  { 0xff902000, 0x7e002000, 0xf1fe0, 0x0 },
-  { 0xff902000, 0x7e802000, 0xf1fe0, 0x0 },
-  { 0xf9e00000, 0x91c00000, 0x6003fe0, 0x0 },
-  { 0xffe03884, 0xafa02880, 0x30078, 0x0 },
-  { 0xf7c02000, 0x22000000, 0x3000fe, 0x0 },
-  { 0xffe03080, 0x9d203000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x26002000, 0x3000fe, 0x0 },
-  { 0xff800000, 0xe2000000, 0x1fe0, 0x0 },
-  { 0xf7c02000, 0x26c00000, 0x3000fe, 0x0 },
-  { 0xff602060, 0x3e400000, 0x1f80, 0x0 },
-  { 0xffe00000, 0x38400000, 0x201f, 0x0 },
-  { 0xfc003800, 0x48002000, 0x3f00000, 0x1 },
-  { 0xff000016, 0xde000000, 0xe020e8, 0x0 },
-  { 0xf8003f00, 0x20003000, 0x7f00000, 0x1 },
-  { 0xf8003e70, 0x20003a60, 0x7f00000, 0x1 },
-  { 0xff902000, 0x7e800000, 0xf1fe0, 0x0 },
-  { 0xffe020c0, 0xad6020c0, 0x3f, 0x0 },
-  { 0xf7c02300, 0x13802000, 0x3000fe, 0x0 },
-  { 0xffe020c0, 0xad600080, 0x3f, 0x0 },
-  { 0xff902000, 0x7e000000, 0xf1fe0, 0x0 },
-  { 0xf7000000, 0x17000000, 0x3000fe, 0x0 },
-  { 0xf7000000, 0x16000000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x25002000, 0x3000fe, 0x0 },
-  { 0xfc003fc7, 0x48003fc7, 0x3f00000, 0x1 },
-  { 0xffc01000, 0x61801000, 0x202ffe, 0x0 },
-  { 0xffe03884, 0xafa03080, 0x30078, 0x0 },
-  { 0xf8003fc4, 0x40003f40, 0x7f00000, 0x1 },
-  { 0xfc003e70, 0x28003a60, 0x3f00000, 0x1 },
-  { 0xf7c02300, 0x13800000, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9f802080, 0x1f0100, 0x0 },
-  { 0xf0000000, 0xb0000000, 0xfe03fe0, 0x0 },
-  { 0xffe03880, 0x9f402080, 0x1f0100, 0x0 },
-  { 0xffe02000, 0x43200000, 0x7e0, 0x0 },
-  { 0xffe00000, 0x39800000, 0x201f, 0x0 },
-  { 0xffe03880, 0x9fc03880, 0x1f0100, 0x0 },
-  { 0xffe02000, 0x45600000, 0x7e0, 0x0 },
-  { 0xf9e00000, 0x91200000, 0x6003fe0, 0x0 },
-  { 0xffe02000, 0x43600000, 0x7e0, 0x0 },
-  { 0xfc003f00, 0x28003800, 0x3f00000, 0x1 },
-  { 0xff802000, 0x74000000, 0x1fe0, 0x0 },
-  { 0xffe02084, 0xaf002084, 0x30078, 0x0 },
-  { 0xff802000, 0x74800000, 0x1fe0, 0x0 },
-  { 0xf7c03000, 0x14c02000, 0x3000fe, 0x0 },
-  { 0xfe000001, 0x5a000000, 0x1ff3ffe, 0x0 },
-  { 0xff602060, 0x3f400020, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x10802000, 0x3000fe, 0x0 },
-  { 0xffe02084, 0xaf802080, 0x30078, 0x0 },
-  { 0xffe00004, 0x46400000, 0x20f8, 0x0 },
-  { 0xffe020c0, 0xad800080, 0x3f, 0x0 },
-  { 0xffe020c0, 0xad8000c0, 0x3f, 0x0 },
-  { 0xf8003fc7, 0x40003f45, 0x7f00000, 0x1 },
-  { 0xf8003e00, 0x60002a00, 0x7f00000, 0x1 },
-  { 0xffe02084, 0xaf600084, 0x30078, 0x0 },
-  { 0xffe03080, 0x9c201000, 0xf60, 0x0 },
-  { 0xffe02000, 0x43400000, 0x7e0, 0x0 },
-  { 0xffe03080, 0x9c203080, 0xf60, 0x0 },
-  { 0xffe02000, 0x41200000, 0x7e0, 0x0 },
-  { 0xffe03080, 0x9c201080, 0xf60, 0x0 },
-  { 0xf7c02300, 0x11c02300, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9fc03080, 0x1f0100, 0x0 },
-  { 0xffe03880, 0x9f402880, 0x1f0100, 0x0 },
-  { 0xf8003800, 0x40002000, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x24402000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x20c02000, 0x3000fe, 0x0 },
-  { 0xf7c02300, 0x11c00000, 0x3000fe, 0x0 },
-  { 0xffe02000, 0x45200000, 0x7e0, 0x0 },
-  { 0xf8003f00, 0x20003900, 0x7f00000, 0x1 },
-  { 0xf7c02300, 0x11c00100, 0x3000fe, 0x0 },
-  { 0xffe02084, 0xaf800084, 0x30078, 0x0 },
-  { 0xfe600000, 0x3c200000, 0x207f, 0x0 },
-  { 0xf7c02000, 0x26800000, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9f003080, 0x1f0100, 0x0 },
-  { 0xffe03884, 0xafa01084, 0x30078, 0x0 },
-  { 0xffc00000, 0x76000000, 0x203fe0, 0x0 },
-  { 0xff602060, 0x3e000040, 0x1f80, 0x0 },
-  { 0xffe020c0, 0xadc020c0, 0x3f, 0x0 },
-  { 0xffe00004, 0x44400000, 0x20f8, 0x0 },
-  { 0xffe020c0, 0xadc02080, 0x3f, 0x0 },
-  { 0xfe600000, 0x3c400000, 0x207f, 0x0 },
-  { 0xf7c02000, 0x20400000, 0x3000fe, 0x0 },
-  { 0xff800000, 0x7c000000, 0x1fe0, 0x0 },
-  { 0xffe03884, 0xafa00080, 0x30078, 0x0 },
-  { 0xff201800, 0x5c001800, 0xdf20fe, 0x0 },
-  { 0xffe02000, 0x47800000, 0x7e0, 0x0 },
-  { 0xff601018, 0xdd400000, 0xfe0, 0x0 },
-  { 0xffe020c0, 0xad4020c0, 0x3f, 0x0 },
-  { 0xffe020c0, 0xad402080, 0x3f, 0x0 },
-  { 0xf8003000, 0x40001000, 0x7f00000, 0x1 },
-  { 0xffe02084, 0xafc02084, 0x30078, 0x0 },
-  { 0xffe03080, 0x9c403080, 0xf60, 0x0 },
-  { 0xfc003e40, 0x28003a00, 0x3f00000, 0x1 },
-  { 0xffe038c0, 0xada010c0, 0x3f, 0x0 },
-  { 0xffe038c0, 0xada01080, 0x3f, 0x0 },
-  { 0xffe038c0, 0xada030c0, 0x3f, 0x0 },
-  { 0xffe038c0, 0xada03080, 0x3f, 0x0 },
-  { 0xf7c02000, 0x20800000, 0x3000fe, 0x0 },
-  { 0xfc003fc7, 0x48003f46, 0x3f00000, 0x1 },
-  { 0xffe01804, 0x44a00000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x20002000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x12c02000, 0x3000fe, 0x0 },
-  { 0xffe03000, 0x9a601000, 0xf60, 0x0 },
-  { 0xffc00000, 0xda800000, 0x203fe0, 0x0 },
-  { 0xf9e00000, 0x90400000, 0x6003fe0, 0x0 },
-  { 0xffe02000, 0x47600000, 0x7e0, 0x0 },
-  { 0xffe03080, 0x9d403000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d403080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d401000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d401080, 0xf60, 0x0 },
-  { 0xffe02000, 0x41400000, 0x7e0, 0x0 },
-  { 0xff800000, 0xdf800000, 0x6020e0, 0x0 },
-  { 0xffc01000, 0x61000000, 0x202ffe, 0x0 },
-  { 0xffe03880, 0x9f202080, 0x1f0100, 0x0 },
-  { 0xfc003fc7, 0x48003fc6, 0x3f00000, 0x1 },
-  { 0xfe000000, 0x7a000000, 0x1fe0, 0x0 },
-  { 0xffff0000, 0x6a490000, 0x1f80, 0x0 },
-  { 0xff802000, 0x73000000, 0x1fe0, 0x0 },
-  { 0xff602060, 0x3e200020, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x24000000, 0x3000fe, 0x0 },
-  { 0xf8003e40, 0x20003a00, 0x7f00000, 0x1 },
-  { 0xf7c03000, 0x14401000, 0x3000fe, 0x0 },
-  { 0xf8003f00, 0x20003200, 0x7f00000, 0x1 },
-  { 0xffc00000, 0x76400000, 0x203fe0, 0x0 },
-  { 0xf7c02000, 0x22002000, 0x3000fe, 0x0 },
-  { 0xffc01000, 0x61c01000, 0x202ffe, 0x0 },
-  { 0xf7c03000, 0x14801000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x12002000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x10402000, 0x3000fe, 0x0 },
-  { 0xff201800, 0x5d200000, 0xdf20fe, 0x0 },
-  { 0xf7c02000, 0x21400000, 0x3000fe, 0x0 },
-  { 0xff201800, 0x5d000000, 0xdf20fe, 0x0 },
-  { 0xffe02000, 0x45c00000, 0x7e0, 0x0 },
-  { 0xf7c02000, 0x25802000, 0x3000fe, 0x0 },
-  { 0xfc003e70, 0x28003a50, 0x3f00000, 0x1 },
-  { 0xf7c02300, 0x13c00300, 0x3000fe, 0x0 },
-  { 0xf9e01800, 0xa1a00800, 0x60020ff, 0x0 },
-  { 0xffe02000, 0x43800000, 0x7e0, 0x0 },
-  { 0xfc003fc4, 0x48003fc0, 0x3f00000, 0x1 },
-  { 0xff800000, 0xe2800000, 0x1fe0, 0x0 },
-  { 0xf7c02300, 0x13c02000, 0x3000fe, 0x0 },
-  { 0xffe03080, 0x9d803080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d803000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d801080, 0xf60, 0x0 },
-  { 0xf8003fc4, 0x40003f00, 0x7f00000, 0x1 },
-  { 0xffe00000, 0x39c00000, 0x201f, 0x0 },
-  { 0xffe03080, 0x9d203080, 0xf60, 0x0 },
-  { 0xffe02080, 0xab000080, 0x3f, 0x0 },
-  { 0xf8003e00, 0x60003c00, 0x7f00000, 0x1 },
-  { 0xffe03880, 0x9f602080, 0x1f0100, 0x0 },
-  { 0xffc00000, 0x76800000, 0x203fe0, 0x0 },
-  { 0xffe03884, 0xafa02084, 0x30078, 0x0 },
-  { 0xf7c02000, 0x13002000, 0x3000fe, 0x0 },
-  { 0xf9e00000, 0x91000000, 0x6003fe0, 0x0 },
-  { 0xffe03080, 0x9d201080, 0xf60, 0x0 },
-  { 0xf7c03000, 0x15002000, 0x3000fe, 0x0 },
-  { 0xf8003000, 0x60000000, 0x7f00000, 0x1 },
-  { 0xffc01000, 0x61800000, 0x202ffe, 0x0 },
-  { 0xf7c03000, 0x14400000, 0x3000fe, 0x0 },
-  { 0xffe03000, 0x9b401000, 0xf60, 0x0 },
-  { 0xf7c03000, 0x14003000, 0x3000fe, 0x0 },
-  { 0xffe03880, 0x9fc02080, 0x1f0100, 0x0 },
-  { 0xfc003fc4, 0x48003f00, 0x3f00000, 0x1 },
-  { 0xffe02000, 0x45000000, 0x7e0, 0x0 },
-  { 0xfc003800, 0x48002800, 0x3f00000, 0x1 },
-  { 0xfc003fc7, 0x48003fc5, 0x3f00000, 0x1 },
-  { 0xfc003d18, 0x28003c00, 0x3f00000, 0x1 },
-  { 0xfc003fc7, 0x48003fc4, 0x3f00000, 0x1 },
-  { 0xf8003f00, 0x60003200, 0x7f00000, 0x1 },
-  { 0xffe02084, 0xaf600080, 0x30078, 0x0 },
-  { 0xf9e01800, 0xa1a00000, 0x60020ff, 0x0 },
-  { 0xf7c03000, 0x14001000, 0x3000fe, 0x0 },
-  { 0xf7c03000, 0x14c01000, 0x3000fe, 0x0 },
-  { 0xffe00004, 0x46c00000, 0x20f8, 0x0 },
-  { 0xf7c03000, 0x15003000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x10000000, 0x3000fe, 0x0 },
-  { 0xf8003d18, 0x20003c08, 0x7f00000, 0x1 },
-  { 0xffc0001c, 0x75400010, 0x203fe0, 0x0 },
-  { 0xf9e00000, 0x48600000, 0x61f20ff, 0x0 },
-  { 0xffe03080, 0x9c603080, 0xf60, 0x0 },
-  { 0xfe000000, 0x58000000, 0x1ff3ffe, 0x0 },
-  { 0xffe03000, 0x9a201000, 0xf60, 0x0 },
-  { 0xffe00000, 0x69e00000, 0x1f18, 0x0 },
-  { 0xffe020c0, 0xad802080, 0x3f, 0x0 },
-  { 0xffe02000, 0x47c00000, 0x7e0, 0x0 },
-  { 0xffe00000, 0x60e00000, 0x1f18, 0x0 },
-  { 0xf7c03000, 0x15402000, 0x3000fe, 0x0 },
-  { 0xffe020c0, 0xad8020c0, 0x3f, 0x0 },
-  { 0xff000016, 0xde000012, 0xe020e8, 0x0 },
-  { 0xf7c02000, 0x25c02000, 0x3000fe, 0x0 },
-  { 0xf8003f00, 0x60003100, 0x7f00000, 0x1 },
-  { 0xf8003f00, 0x60003000, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x25800000, 0x3000fe, 0x0 },
-  { 0xf7c03000, 0x14403000, 0x3000fe, 0x0 },
-  { 0xfc003d18, 0x28003c08, 0x3f00000, 0x1 },
-  { 0xffe03880, 0x9f403080, 0x1f0100, 0x0 },
-  { 0xf7c02000, 0x25402000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x10c00000, 0x3000fe, 0x0 },
-  { 0xffe02000, 0x45800000, 0x7e0, 0x0 },
-  { 0xffe03880, 0x9f803080, 0x1f0100, 0x0 },
-  { 0xffe03080, 0x9d001000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d001080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d003000, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d003080, 0xf60, 0x0 },
-  { 0xffe03080, 0x9d801000, 0xf60, 0x0 },
-  { 0xf9e00000, 0x49200000, 0x61f3fe0, 0x0 },
-  { 0xf9e00000, 0xa1c00000, 0x60020ff, 0x0 },
-  { 0xf9e00000, 0x90200000, 0x6003fe0, 0x0 },
-  { 0xffe03080, 0x9d201000, 0xf60, 0x0 },
-  { 0xffe03884, 0xafa01080, 0x30078, 0x0 },
-  { 0xffe02084, 0xaf602080, 0x30078, 0x0 },
-  { 0xffe038c0, 0xada000c0, 0x3f, 0x0 },
-  { 0xffe02080, 0xab400080, 0x3f, 0x0 },
-  { 0xff000016, 0xde000004, 0xe020e8, 0x0 },
-  { 0xffe00004, 0x44000000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x20000000, 0x3000fe, 0x0 },
-  { 0xfc003d18, 0x28003c10, 0x3f00000, 0x1 },
-  { 0xff600018, 0xdd000008, 0x1fe0, 0x0 },
-  { 0xffe020c0, 0xadc000c0, 0x3f, 0x0 },
-  { 0xffe020c0, 0xadc00080, 0x3f, 0x0 },
-  { 0xffe03000, 0x9b801000, 0xf60, 0x0 },
-  { 0xf8003fc7, 0x40003f46, 0x7f00000, 0x1 },
-  { 0xf7c02000, 0x21c02000, 0x3000fe, 0x0 },
-  { 0xffe01804, 0x40a00000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x26402000, 0x3000fe, 0x0 },
-  { 0xffe03080, 0x9c401080, 0xf60, 0x0 },
-  { 0xffe00000, 0x39200000, 0x201f, 0x0 },
-  { 0xffe03080, 0x9c403000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x11002000, 0x3000fe, 0x0 },
-  { 0xfc003c00, 0x28002800, 0x3f00000, 0x1 },
-  { 0xffe00004, 0x40400000, 0x20f8, 0x0 },
-  { 0xf7c02000, 0x26802000, 0x3000fe, 0x0 },
-  { 0xf7c02000, 0x13000000, 0x3000fe, 0x0 },
-  { 0xffe00004, 0x42600000, 0x20f8, 0x0 },
-  { 0xf8003000, 0x60001000, 0x7f00000, 0x1 },
-  { 0xff602060, 0x3e400020, 0x1f80, 0x0 },
-  { 0xff602060, 0x3f000000, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x24c02000, 0x3000fe, 0x0 },
-  { 0xff802000, 0x74002000, 0x1fe0, 0x0 },
-  { 0xf8003800, 0x20002000, 0x7f00000, 0x1 },
-  { 0xffe03000, 0x9aa01000, 0xf60, 0x0 },
-  { 0xf7c02000, 0x12400000, 0x3000fe, 0x0 },
-  { 0xff602060, 0x3f000060, 0x1f80, 0x0 },
-  { 0xf7c02000, 0x11000000, 0x3000fe, 0x0 },
-};
-
-/// \brief finds the scatter Bits that need to be used to apply relocations
-inline uint32_t findv4bitmask(uint8_t *location) {
-  uint32_t insn = llvm::support::endian::read32le(location);
-  for (int32_t i = 0, e = llvm::array_lengthof(insn_encodings); i < e; i++) {
-    if ((insn & 0xc000) == 0 && !insn_encodings[i].isDuplex)
-      continue;
-    if ((insn & 0xc000) != 0 && insn_encodings[i].isDuplex)
-      continue;
-    if ((insn_encodings[i].insnMask & insn) == insn_encodings[i].insnCmpMask)
-      return insn_encodings[i].insnBitMask;
-  }
-  llvm_unreachable("found unknown Hexagon instruction");
-}
-
-} // namespace elf
-} // namespace lld
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h b/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h
deleted file mode 100644
index 390694954a75..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef HEXAGON_EXECUTABLE_WRITER_H
-#define HEXAGON_EXECUTABLE_WRITER_H
-
-#include "ExecutableWriter.h"
-#include "HexagonLinkingContext.h"
-#include "HexagonTargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-class HexagonTargetLayout;
-
-class HexagonExecutableWriter : public ExecutableWriter<ELF32LE> {
-public:
-  HexagonExecutableWriter(HexagonLinkingContext &ctx,
-                          HexagonTargetLayout &layout);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void finalizeDefaultAtomValues() override;
-
-  std::error_code setELFHeader() override {
-    ExecutableWriter::setELFHeader();
-    setHexagonELFHeader(*_elfHeader);
-    return std::error_code();
-  }
-
-private:
-  HexagonLinkingContext &_ctx;
-  HexagonTargetLayout &_targetLayout;
-};
-
-HexagonExecutableWriter::HexagonExecutableWriter(HexagonLinkingContext &ctx,
-                                                 HexagonTargetLayout &layout)
-    : ExecutableWriter(ctx, layout), _ctx(ctx), _targetLayout(layout) {}
-
-void HexagonExecutableWriter::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  ExecutableWriter::createImplicitFiles(result);
-  // Add the default atoms as defined for hexagon
-  auto file =
-      llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "Hexagon runtime file");
-  file->addAbsoluteAtom("_SDA_BASE_");
-  if (_ctx.isDynamic()) {
-    file->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_");
-    file->addAbsoluteAtom("_DYNAMIC");
-  }
-  result.push_back(std::move(file));
-}
-
-void HexagonExecutableWriter::finalizeDefaultAtomValues() {
-  // Finalize the atom values that are part of the parent.
-  ExecutableWriter::finalizeDefaultAtomValues();
-  AtomLayout *sdabaseAtom = _targetLayout.findAbsoluteAtom("_SDA_BASE_");
-  sdabaseAtom->_virtualAddr = _targetLayout.getSDataSection()->virtualAddr();
-  if (_ctx.isDynamic())
-    finalizeHexagonRuntimeAtomValues(_targetLayout);
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif // HEXAGON_EXECUTABLE_WRITER_H
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp b/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
deleted file mode 100644
index 11eabf7e26fc..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp -------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HexagonLinkingContext.h"
-#include "HexagonTargetHandler.h"
-
-namespace lld {
-namespace elf {
-
-std::unique_ptr<ELFLinkingContext>
-createHexagonLinkingContext(llvm::Triple triple) {
-  if (triple.getArch() == llvm::Triple::hexagon)
-    return llvm::make_unique<HexagonLinkingContext>(triple);
-  return nullptr;
-}
-
-HexagonLinkingContext::HexagonLinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(triple, std::unique_ptr<TargetHandler>(
-                                    new HexagonTargetHandler(*this))) {}
-
-static const Registry::KindStrings kindStrings[] = {
-#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
-#include "llvm/Support/ELFRelocs/Hexagon.def"
-#undef ELF_RELOC
-  LLD_KIND_STRING_END
-};
-
-void HexagonLinkingContext::registerRelocationNames(Registry &registry) {
-  registry.addKindTable(Reference::KindNamespace::ELF,
-                        Reference::KindArch::Hexagon, kindStrings);
-}
-
-void setHexagonELFHeader(ELFHeader<ELF32LE> &elfHeader) {
-  elfHeader.e_ident(llvm::ELF::EI_VERSION, 1);
-  elfHeader.e_ident(llvm::ELF::EI_OSABI, 0);
-  elfHeader.e_version(1);
-  elfHeader.e_flags(0x3);
-}
-
-} // namespace elf
-} // namespace lld
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h b/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
deleted file mode 100644
index ab91e405fd56..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h ---------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
-#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
-
-#include "OutputELFWriter.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/ELF.h"
-
-namespace lld {
-namespace elf {
-
-class HexagonLinkingContext final : public ELFLinkingContext {
-public:
-  int getMachineType() const override { return llvm::ELF::EM_HEXAGON; }
-  HexagonLinkingContext(llvm::Triple triple);
-
-  void addPasses(PassManager &) override;
-  void registerRelocationNames(Registry &r) override;
-
-  bool isDynamicRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    switch (r.kindValue()) {
-    case llvm::ELF::R_HEX_RELATIVE:
-    case llvm::ELF::R_HEX_GLOB_DAT:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  bool isPLTRelocation(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    return r.kindValue() == llvm::ELF::R_HEX_JMP_SLOT;
-  }
-
-  /// \brief Hexagon has only one relative relocation
-  /// a) for supporting relative relocs - R_HEX_RELATIVE
-  bool isRelativeReloc(const Reference &r) const override {
-    if (r.kindNamespace() != Reference::KindNamespace::ELF)
-      return false;
-    return r.kindValue() == llvm::ELF::R_HEX_RELATIVE;
-  }
-};
-
-void setHexagonELFHeader(ELFHeader<ELF32LE> &elfHeader);
-
-} // elf
-} // lld
-
-#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp b/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp
deleted file mode 100644
index 0a201b32b5f1..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp ---------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HexagonEncodings.h"
-#include "HexagonLinkingContext.h"
-#include "HexagonRelocationHandler.h"
-#include "HexagonTargetHandler.h"
-#include "llvm/Support/Endian.h"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm::ELF;
-using namespace llvm::support::endian;
-
-// Scatter val's bits as specified by the mask. Example:
-//
-//  Val:    0bABCDEFG
-//  Mask:   0b10111100001011
-//  Output: 0b00ABCD0000E0FG
-static uint32_t scatterBits(uint32_t val, uint32_t mask) {
-  uint32_t result = 0;
-  size_t off = 0;
-  for (size_t bit = 0; bit < 32; ++bit) {
-    if ((mask >> bit) & 1) {
-      uint32_t valBit = (val >> off) & 1;
-      result |= valBit << bit;
-      ++off;
-    }
-  }
-  return result;
-}
-
-static void relocBNPCREL(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A,
-                         int32_t nBits) {
-  int32_t result = (S + A - P) >> 2;
-  int32_t range = 1 << nBits;
-  if (result < range && result > -range) {
-    result = scatterBits(result, findv4bitmask(loc));
-    write32le(loc, result | read32le(loc));
-  }
-}
-
-/// \brief Word32_LO: 0x00c03fff : (S + A) : Truncate
-static void relocLO16(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  uint32_t result = S + A;
-  result = scatterBits(result, 0x00c03fff);
-  write32le(loc, result | read32le(loc));
-}
-
-/// \brief Word32_LO: 0x00c03fff : (S + A) >> 16 : Truncate
-static void relocHI16(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  uint32_t result = (S + A) >> 16;
-  result = scatterBits(result, 0x00c03fff);
-  write32le(loc, result | read32le(loc));
-}
-
-/// \brief Word32: 0xffffffff : (S + A) : Truncate
-static void reloc32(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  uint32_t result = S + A;
-  write32le(loc, result | read32le(loc));
-}
-
-static void reloc32_6_X(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  int64_t result = (S + A) >> 6;
-  int64_t range = int64_t(1) << 32;
-  if (result > range)
-  result = scatterBits(result, 0xfff3fff);
-  write32le(loc, result | read32le(loc));
-}
-
-// R_HEX_B32_PCREL_X
-static void relocHexB32PCRELX(uint8_t *loc, uint64_t P, uint64_t S,
-                              uint64_t A) {
-  int64_t result = (S + A - P) >> 6;
-  result = scatterBits(result, 0xfff3fff);
-  write32le(loc, result | read32le(loc));
-}
-
-// R_HEX_BN_PCREL_X
-static void relocHexBNPCRELX(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A,
-                             int nbits) {
-  int32_t result = (S + A - P) & 0x3f;
-  int32_t range = 1 << nbits;
-  if (result < range && result > -range) {
-    result = scatterBits(result, findv4bitmask(loc));
-    write32le(loc, result | read32le(loc));
-  }
-}
-
-// R_HEX_6_PCREL_X
-static void relocHex6PCRELX(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  int32_t result = S + A - P;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-// R_HEX_N_X : Word32_U6 : (S + A) : Unsigned Truncate
-static void relocHex_N_X(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A) {
-  uint32_t result = S + A;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-// GP REL relocs
-static void relocHexGPRELN(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A,
-                           uint64_t GP, int nShiftBits) {
-  int32_t result = (S + A - GP) >> nShiftBits;
-  int32_t range = 1L << 16;
-  if (result <= range) {
-    result = scatterBits(result, findv4bitmask(loc));
-    write32le(loc, result | read32le(loc));
-  }
-}
-
-/// \brief Word32_LO: 0x00c03fff : (G) : Truncate
-static void relocHexGOTLO16(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = A - GOT;
-  result = scatterBits(result, 0x00c03fff);
-  write32le(loc, result | read32le(loc));
-}
-
-/// \brief Word32_LO: 0x00c03fff : (G) >> 16 : Truncate
-static void relocHexGOTHI16(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = (A - GOT) >> 16;
-  result = scatterBits(result, 0x00c03fff);
-  write32le(loc, result | read32le(loc));
-}
-
-/// \brief Word32: 0xffffffff : (G) : Truncate
-static void relocHexGOT32(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = GOT - A;
-  write32le(loc, result | read32le(loc));
-}
-
-/// \brief Word32_U16 : (G) : Truncate
-static void relocHexGOT16(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = GOT - A;
-  int32_t range = 1L << 16;
-  if (result <= range) {
-    result = scatterBits(result, findv4bitmask(loc));
-    write32le(loc, result | read32le(loc));
-  }
-}
-
-static void relocHexGOT32_6_X(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = (A - GOT) >> 6;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-static void relocHexGOT16_X(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  int32_t result = A - GOT;
-  int32_t range = 1L << 6;
-  if (result <= range) {
-    result = scatterBits(result, findv4bitmask(loc));
-    write32le(loc, result | read32le(loc));
-  }
-}
-
-static void relocHexGOT11_X(uint8_t *loc, uint64_t A, uint64_t GOT) {
-  uint32_t result = A - GOT;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-static void relocHexGOTRELSigned(uint8_t *loc, uint64_t P, uint64_t S,
-                                 uint64_t A, uint64_t GOT, int shiftBits) {
-  int32_t result = (S + A - GOT) >> shiftBits;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-static void relocHexGOTRELUnsigned(uint8_t *loc, uint64_t P, uint64_t S,
-                                   uint64_t A, uint64_t GOT) {
-  uint32_t result = S + A - GOT;
-  result = scatterBits(result, findv4bitmask(loc));
-  write32le(loc, result | read32le(loc));
-}
-
-static void relocHexGOTREL_HILO16(uint8_t *loc, uint64_t P, uint64_t S,
-                                  uint64_t A, uint64_t GOT, int shiftBits) {
-  int32_t result = (S + A - GOT) >> shiftBits;
-  result = scatterBits(result, 0x00c03fff);
-  write32le(loc, result | read32le(loc));
-}
-
-static void relocHexGOTREL_32(uint8_t *loc, uint64_t P, uint64_t S, uint64_t A,
-                              uint64_t GOT) {
-  int32_t result = S + A - GOT;
-  write32le(loc, result | read32le(loc));
-}
-
-std::error_code HexagonTargetRelocationHandler::applyRelocation(
-    ELFWriter &writer, llvm::FileOutputBuffer &buf, const AtomLayout &atom,
-    const Reference &ref) const {
-  uint8_t *atomContent = buf.getBufferStart() + atom._fileOffset;
-  uint8_t *loc = atomContent + ref.offsetInAtom();
-  uint64_t target = writer.addressOfAtom(ref.target());
-  uint64_t reloc = atom._virtualAddr + ref.offsetInAtom();
-
-  if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-    return std::error_code();
-  assert(ref.kindArch() == Reference::KindArch::Hexagon);
-  switch (ref.kindValue()) {
-  case R_HEX_B22_PCREL:
-    relocBNPCREL(loc, reloc, target, ref.addend(), 21);
-    break;
-  case R_HEX_B15_PCREL:
-    relocBNPCREL(loc, reloc, target, ref.addend(), 14);
-    break;
-  case R_HEX_B9_PCREL:
-    relocBNPCREL(loc, reloc, target, ref.addend(), 8);
-    break;
-  case R_HEX_LO16:
-    relocLO16(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_HI16:
-    relocHI16(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_32:
-    reloc32(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_32_6_X:
-    reloc32_6_X(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_B32_PCREL_X:
-    relocHexB32PCRELX(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_B22_PCREL_X:
-    relocHexBNPCRELX(loc, reloc, target, ref.addend(), 21);
-    break;
-  case R_HEX_B15_PCREL_X:
-    relocHexBNPCRELX(loc, reloc, target, ref.addend(), 14);
-    break;
-  case R_HEX_B13_PCREL_X:
-    relocHexBNPCRELX(loc, reloc, target, ref.addend(), 12);
-    break;
-  case R_HEX_B9_PCREL_X:
-    relocHexBNPCRELX(loc, reloc, target, ref.addend(), 8);
-    break;
-  case R_HEX_B7_PCREL_X:
-    relocHexBNPCRELX(loc, reloc, target, ref.addend(), 6);
-    break;
-  case R_HEX_GPREL16_0:
-    relocHexGPRELN(loc, reloc, target, ref.addend(),
-                   _targetLayout.getSDataSection()->virtualAddr(), 0);
-    break;
-  case R_HEX_GPREL16_1:
-    relocHexGPRELN(loc, reloc, target, ref.addend(),
-                   _targetLayout.getSDataSection()->virtualAddr(), 1);
-    break;
-  case R_HEX_GPREL16_2:
-    relocHexGPRELN(loc, reloc, target, ref.addend(),
-                   _targetLayout.getSDataSection()->virtualAddr(), 2);
-    break;
-  case R_HEX_GPREL16_3:
-    relocHexGPRELN(loc, reloc, target, ref.addend(),
-                   _targetLayout.getSDataSection()->virtualAddr(), 3);
-    break;
-  case R_HEX_16_X:
-  case R_HEX_12_X:
-  case R_HEX_11_X:
-  case R_HEX_10_X:
-  case R_HEX_9_X:
-  case R_HEX_8_X:
-  case R_HEX_7_X:
-  case R_HEX_6_X:
-    relocHex_N_X(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_6_PCREL_X:
-    relocHex6PCRELX(loc, reloc, target, ref.addend());
-    break;
-  case R_HEX_JMP_SLOT:
-  case R_HEX_GLOB_DAT:
-    break;
-  case R_HEX_GOTREL_32:
-    relocHexGOTREL_32(loc, reloc, target, ref.addend(),
-                      _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOTREL_LO16:
-    relocHexGOTREL_HILO16(loc, reloc, target, ref.addend(),
-                          _targetLayout.getGOTSymAddr(), 0);
-    break;
-  case R_HEX_GOTREL_HI16:
-    relocHexGOTREL_HILO16(loc, reloc, target, ref.addend(),
-                          _targetLayout.getGOTSymAddr(), 16);
-    break;
-  case R_HEX_GOT_LO16:
-    relocHexGOTLO16(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_HI16:
-    relocHexGOTHI16(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_32:
-    relocHexGOT32(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_16:
-    relocHexGOT16(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_32_6_X:
-    relocHexGOT32_6_X(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_16_X:
-    relocHexGOT16_X(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOT_11_X:
-    relocHexGOT11_X(loc, target, _targetLayout.getGOTSymAddr());
-    break;
-  case R_HEX_GOTREL_32_6_X:
-    relocHexGOTRELSigned(loc, reloc, target, ref.addend(),
-                         _targetLayout.getGOTSymAddr(), 6);
-    break;
-  case R_HEX_GOTREL_16_X:
-  case R_HEX_GOTREL_11_X:
-    relocHexGOTRELUnsigned(loc, reloc, target, ref.addend(),
-                           _targetLayout.getGOTSymAddr());
-    break;
-
-  default:
-    return make_unhandled_reloc_error();
-  }
-
-  return std::error_code();
-}
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h b/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
deleted file mode 100644
index 6afba0ddb8f3..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//===- lld/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h -----------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_HANDLER_H
-#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_HANDLER_H
-
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-
-namespace lld {
-namespace elf {
-class HexagonTargetHandler;
-class HexagonTargetLayout;
-
-class HexagonTargetRelocationHandler final : public TargetRelocationHandler {
-public:
-  HexagonTargetRelocationHandler(HexagonTargetLayout &layout)
-      : _targetLayout(layout) {}
-
-  std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
-                                  const AtomLayout &,
-                                  const Reference &) const override;
-
-private:
-  HexagonTargetLayout &_targetLayout;
-};
-} // elf
-} // lld
-#endif
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp b/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
deleted file mode 100644
index 6c0360c310f4..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp --------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HexagonExecutableWriter.h"
-#include "HexagonDynamicLibraryWriter.h"
-#include "HexagonLinkingContext.h"
-#include "HexagonTargetHandler.h"
-
-using namespace llvm::ELF;
-
-using llvm::makeArrayRef;
-
-namespace lld {
-namespace elf {
-
-HexagonTargetHandler::HexagonTargetHandler(HexagonLinkingContext &ctx)
-    : _ctx(ctx), _targetLayout(new HexagonTargetLayout(ctx)),
-      _relocationHandler(new HexagonTargetRelocationHandler(*_targetLayout)) {}
-
-std::unique_ptr<Writer> HexagonTargetHandler::getWriter() {
-  switch (_ctx.getOutputELFType()) {
-  case llvm::ELF::ET_EXEC:
-    return llvm::make_unique<HexagonExecutableWriter>(_ctx, *_targetLayout);
-  case llvm::ELF::ET_DYN:
-    return llvm::make_unique<HexagonDynamicLibraryWriter>(_ctx, *_targetLayout);
-  case llvm::ELF::ET_REL:
-    llvm_unreachable("TODO: support -r mode");
-  default:
-    llvm_unreachable("unsupported output type");
-  }
-}
-
-using namespace llvm::ELF;
-
-// .got atom
-const uint8_t hexagonGotAtomContent[4] = { 0 };
-// .got.plt atom (entry 0)
-const uint8_t hexagonGotPlt0AtomContent[16] = { 0 };
-// .got.plt atom (all other entries)
-const uint8_t hexagonGotPltAtomContent[4] = { 0 };
-// .plt (entry 0)
-const uint8_t hexagonPlt0AtomContent[28] = {
-  0x00, 0x40, 0x00, 0x00, // { immext (#0)
-  0x1c, 0xc0, 0x49, 0x6a, //   r28 = add (pc, ##GOT0@PCREL) } # address of GOT0
-  0x0e, 0x42, 0x9c, 0xe2, // { r14 -= add (r28, #16)  # offset of GOTn from GOTa
-  0x4f, 0x40, 0x9c, 0x91, //   r15 = memw (r28 + #8)  # object ID at GOT2
-  0x3c, 0xc0, 0x9c, 0x91, //   r28 = memw (r28 + #4) }# dynamic link at GOT1
-  0x0e, 0x42, 0x0e, 0x8c, // { r14 = asr (r14, #2)    # index of PLTn
-  0x00, 0xc0, 0x9c, 0x52, //   jumpr r28 }            # call dynamic linker
-};
-
-// .plt (other entries)
-const uint8_t hexagonPltAtomContent[16] = {
-  0x00, 0x40, 0x00, 0x00, // { immext (#0)
-  0x0e, 0xc0, 0x49, 0x6a, //   r14 = add (pc, ##GOTn@PCREL) } # address of GOTn
-  0x1c, 0xc0, 0x8e, 0x91, // r28 = memw (r14)                 # contents of GOTn
-  0x00, 0xc0, 0x9c, 0x52, // jumpr r28                        # call it
-};
-
-class HexagonGOTAtom : public GOTAtom {
-public:
-  HexagonGOTAtom(const File &f) : GOTAtom(f, ".got") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return makeArrayRef(hexagonGotAtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-class HexagonGOTPLTAtom : public GOTAtom {
-public:
-  HexagonGOTPLTAtom(const File &f) : GOTAtom(f, ".got.plt") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return makeArrayRef(hexagonGotPltAtomContent);
-  }
-
-  Alignment alignment() const override { return 4; }
-};
-
-class HexagonGOTPLT0Atom : public GOTAtom {
-public:
-  HexagonGOTPLT0Atom(const File &f) : GOTAtom(f, ".got.plt") {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return makeArrayRef(hexagonGotPlt0AtomContent);
-  }
-
-  Alignment alignment() const override { return 8; }
-};
-
-class HexagonPLT0Atom : public PLT0Atom {
-public:
-  HexagonPLT0Atom(const File &f) : PLT0Atom(f) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return makeArrayRef(hexagonPlt0AtomContent);
-  }
-};
-
-class HexagonPLTAtom : public PLTAtom {
-
-public:
-  HexagonPLTAtom(const File &f, StringRef secName) : PLTAtom(f, secName) {}
-
-  ArrayRef<uint8_t> rawContent() const override {
-    return makeArrayRef(hexagonPltAtomContent);
-  }
-};
-
-class ELFPassFile : public SimpleFile {
-public:
-  ELFPassFile(const ELFLinkingContext &eti) : SimpleFile("ELFPassFile") {
-    setOrdinal(eti.getNextOrdinalAndIncrement());
-  }
-
-  llvm::BumpPtrAllocator _alloc;
-};
-
-/// \brief Create GOT and PLT entries for relocations. Handles standard GOT/PLT
-template <class Derived> class GOTPLTPass : public Pass {
-  /// \brief Handle a specific reference.
-  void handleReference(const DefinedAtom &atom, const Reference &ref) {
-    if (ref.kindNamespace() != Reference::KindNamespace::ELF)
-      return;
-    assert(ref.kindArch() == Reference::KindArch::Hexagon);
-    switch (ref.kindValue()) {
-    case R_HEX_PLT_B22_PCREL:
-    case R_HEX_B22_PCREL:
-      static_cast<Derived *>(this)->handlePLT32(ref);
-      break;
-    case R_HEX_GOT_LO16:
-    case R_HEX_GOT_HI16:
-    case R_HEX_GOT_32_6_X:
-    case R_HEX_GOT_16_X:
-    case R_HEX_GOT_11_X:
-      static_cast<Derived *>(this)->handleGOTREL(ref);
-      break;
-    }
-  }
-
-protected:
-  /// \brief Create a GOT entry containing 0.
-  const GOTAtom *getNullGOT() {
-    if (!_null) {
-      _null = new (_file._alloc) HexagonGOTPLTAtom(_file);
-#ifndef NDEBUG
-      _null->_name = "__got_null";
-#endif
-    }
-    return _null;
-  }
-
-public:
-  GOTPLTPass(const ELFLinkingContext &ctx) : _file(ctx) {}
-
-  /// \brief Do the pass.
-  ///
-  /// The goal here is to first process each reference individually. Each call
-  /// to handleReference may modify the reference itself and/or create new
-  /// atoms which must be stored in one of the maps below.
-  ///
-  /// After all references are handled, the atoms created during that are all
-  /// added to mf.
-  std::error_code perform(SimpleFile &mf) override {
-    // Process all references.
-    for (const auto &atom : mf.defined())
-      for (const auto &ref : *atom)
-        handleReference(*atom, *ref);
-
-    // Add all created atoms to the link.
-    uint64_t ordinal = 0;
-    if (_plt0) {
-      _plt0->setOrdinal(ordinal++);
-      mf.addAtom(*_plt0);
-    }
-    for (auto &plt : _pltVector) {
-      plt->setOrdinal(ordinal++);
-      mf.addAtom(*plt);
-    }
-    if (_null) {
-      _null->setOrdinal(ordinal++);
-      mf.addAtom(*_null);
-    }
-    if (_got0) {
-      _got0->setOrdinal(ordinal++);
-      mf.addAtom(*_got0);
-    }
-    for (auto &got : _gotVector) {
-      got->setOrdinal(ordinal++);
-      mf.addAtom(*got);
-    }
-
-    return std::error_code();
-  }
-
-protected:
-  /// \brief Owner of all the Atoms created by this pass.
-  ELFPassFile _file;
-
-  /// \brief Map Atoms to their GOT entries.
-  llvm::DenseMap<const Atom *, GOTAtom *> _gotMap;
-
-  /// \brief Map Atoms to their PLT entries.
-  llvm::DenseMap<const Atom *, PLTAtom *> _pltMap;
-
-  /// \brief the list of GOT/PLT atoms
-  std::vector<GOTAtom *> _gotVector;
-  std::vector<PLTAtom *> _pltVector;
-
-  /// \brief GOT entry that is always 0. Used for undefined weaks.
-  GOTAtom *_null = nullptr;
-
-  /// \brief The got and plt entries for .PLT0. This is used to call into the
-  /// dynamic linker for symbol resolution.
-  /// @{
-  PLT0Atom *_plt0 = nullptr;
-  GOTAtom *_got0 = nullptr;
-  /// @}
-};
-
-class DynamicGOTPLTPass final : public GOTPLTPass<DynamicGOTPLTPass> {
-public:
-  DynamicGOTPLTPass(const HexagonLinkingContext &ctx) : GOTPLTPass(ctx) {
-    _got0 = new (_file._alloc) HexagonGOTPLT0Atom(_file);
-#ifndef NDEBUG
-    _got0->_name = "__got0";
-#endif
-  }
-
-  const PLT0Atom *getPLT0() {
-    if (_plt0)
-      return _plt0;
-    _plt0 = new (_file._alloc) HexagonPLT0Atom(_file);
-    _plt0->addReferenceELF_Hexagon(R_HEX_B32_PCREL_X, 0, _got0, 0);
-    _plt0->addReferenceELF_Hexagon(R_HEX_6_PCREL_X, 4, _got0, 4);
-    DEBUG_WITH_TYPE("PLT", llvm::dbgs() << "[ PLT0/GOT0 ] "
-                                        << "Adding plt0/got0 \n");
-    return _plt0;
-  }
-
-  const PLTAtom *getPLTEntry(const Atom *a) {
-    auto plt = _pltMap.find(a);
-    if (plt != _pltMap.end())
-      return plt->second;
-    auto ga = new (_file._alloc) HexagonGOTPLTAtom(_file);
-    ga->addReferenceELF_Hexagon(R_HEX_JMP_SLOT, 0, a, 0);
-    auto pa = new (_file._alloc) HexagonPLTAtom(_file, ".plt");
-    pa->addReferenceELF_Hexagon(R_HEX_B32_PCREL_X, 0, ga, 0);
-    pa->addReferenceELF_Hexagon(R_HEX_6_PCREL_X, 4, ga, 4);
-
-    // Point the got entry to the PLT0 atom initially
-    ga->addReferenceELF_Hexagon(R_HEX_32, 0, getPLT0(), 0);
-#ifndef NDEBUG
-    ga->_name = "__got_";
-    ga->_name += a->name();
-    pa->_name = "__plt_";
-    pa->_name += a->name();
-    DEBUG_WITH_TYPE("PLT", llvm::dbgs() << "[" << a->name() << "] "
-                                        << "Adding plt/got: " << pa->_name
-                                        << "/" << ga->_name << "\n");
-#endif
-    _gotMap[a] = ga;
-    _pltMap[a] = pa;
-    _gotVector.push_back(ga);
-    _pltVector.push_back(pa);
-    return pa;
-  }
-
-  const GOTAtom *getGOTEntry(const Atom *a) {
-    auto got = _gotMap.find(a);
-    if (got != _gotMap.end())
-      return got->second;
-    auto ga = new (_file._alloc) HexagonGOTAtom(_file);
-    ga->addReferenceELF_Hexagon(R_HEX_GLOB_DAT, 0, a, 0);
-
-#ifndef NDEBUG
-    ga->_name = "__got_";
-    ga->_name += a->name();
-    DEBUG_WITH_TYPE("GOT", llvm::dbgs() << "[" << a->name() << "] "
-                                        << "Adding got: " << ga->_name << "\n");
-#endif
-    _gotMap[a] = ga;
-    _gotVector.push_back(ga);
-    return ga;
-  }
-
-  std::error_code handleGOTREL(const Reference &ref) {
-    // Turn this so that the target is set to the GOT entry
-    const_cast<Reference &>(ref).setTarget(getGOTEntry(ref.target()));
-    return std::error_code();
-  }
-
-  std::error_code handlePLT32(const Reference &ref) {
-    // Turn this into a PC32 to the PLT entry.
-    assert(ref.kindNamespace() == Reference::KindNamespace::ELF);
-    assert(ref.kindArch() == Reference::KindArch::Hexagon);
-    const_cast<Reference &>(ref).setKindValue(R_HEX_B22_PCREL);
-    const_cast<Reference &>(ref).setTarget(getPLTEntry(ref.target()));
-    return std::error_code();
-  }
-};
-
-void HexagonLinkingContext::addPasses(PassManager &pm) {
-  if (isDynamic())
-    pm.add(llvm::make_unique<DynamicGOTPLTPass>(*this));
-  ELFLinkingContext::addPasses(pm);
-}
-
-void SDataSection::doPreFlight() {
-  // sort the atoms on the alignments they have been set
-  std::stable_sort(_atoms.begin(), _atoms.end(), [](const AtomLayout *A,
-                                                    const AtomLayout *B) {
-    const DefinedAtom *definedAtomA = cast<DefinedAtom>(A->_atom);
-    const DefinedAtom *definedAtomB = cast<DefinedAtom>(B->_atom);
-    int64_t alignmentA = definedAtomA->alignment().value;
-    int64_t alignmentB = definedAtomB->alignment().value;
-    if (alignmentA == alignmentB) {
-      if (definedAtomA->merge() == DefinedAtom::mergeAsTentative)
-        return false;
-      if (definedAtomB->merge() == DefinedAtom::mergeAsTentative)
-        return true;
-    }
-    return alignmentA < alignmentB;
-  });
-
-  // Set the fileOffset, and the appropriate size of the section
-  for (auto &ai : _atoms) {
-    const DefinedAtom *definedAtom = cast<DefinedAtom>(ai->_atom);
-    DefinedAtom::Alignment atomAlign = definedAtom->alignment();
-    uint64_t fOffset = alignOffset(fileSize(), atomAlign);
-    uint64_t mOffset = alignOffset(memSize(), atomAlign);
-    ai->_fileOffset = fOffset;
-    _fsize = fOffset + definedAtom->size();
-    _msize = mOffset + definedAtom->size();
-  }
-} // finalize
-
-SDataSection::SDataSection(const HexagonLinkingContext &ctx)
-    : AtomSection(ctx, ".sdata", DefinedAtom::typeDataFast, 0,
-                  HexagonTargetLayout::ORDER_SDATA) {
-  _type = SHT_PROGBITS;
-  _flags = SHF_ALLOC | SHF_WRITE;
-  _alignment = 4096;
-}
-
-const AtomLayout *SDataSection::appendAtom(const Atom *atom) {
-  const DefinedAtom *definedAtom = cast<DefinedAtom>(atom);
-  DefinedAtom::Alignment atomAlign = definedAtom->alignment();
-  uint64_t alignment = atomAlign.value;
-  _atoms.push_back(new (_alloc) AtomLayout(atom, 0, 0));
-  // Set the section alignment to the largest alignment
-  // std::max doesn't support uint64_t
-  if (_alignment < alignment)
-    _alignment = alignment;
-  return _atoms.back();
-}
-
-void finalizeHexagonRuntimeAtomValues(HexagonTargetLayout &layout) {
-  AtomLayout *gotAtom = layout.findAbsoluteAtom("_GLOBAL_OFFSET_TABLE_");
-  OutputSection<ELF32LE> *gotpltSection = layout.findOutputSection(".got.plt");
-  if (gotpltSection)
-    gotAtom->_virtualAddr = gotpltSection->virtualAddr();
-  else
-    gotAtom->_virtualAddr = 0;
-  AtomLayout *dynamicAtom = layout.findAbsoluteAtom("_DYNAMIC");
-  OutputSection<ELF32LE> *dynamicSection = layout.findOutputSection(".dynamic");
-  if (dynamicSection)
-    dynamicAtom->_virtualAddr = dynamicSection->virtualAddr();
-  else
-    dynamicAtom->_virtualAddr = 0;
-}
-
-} // namespace elf
-} // namespace lld
diff --git a/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
deleted file mode 100644
index b1366bed09ea..000000000000
--- a/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h ----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef HEXAGON_TARGET_HANDLER_H
-#define HEXAGON_TARGET_HANDLER_H
-
-#include "ELFReader.h"
-#include "HexagonELFFile.h"
-#include "HexagonRelocationHandler.h"
-#include "TargetLayout.h"
-
-namespace lld {
-namespace elf {
-class HexagonLinkingContext;
-
-/// \brief Handle Hexagon SData section
-class SDataSection : public AtomSection<ELF32LE> {
-public:
-  SDataSection(const HexagonLinkingContext &ctx);
-
-  /// \brief Finalize the section contents before writing
-  void doPreFlight() override;
-
-  /// \brief Does this section have an output segment.
-  bool hasOutputSegment() const override { return true; }
-
-  const AtomLayout *appendAtom(const Atom *atom) override;
-};
-
-/// \brief TargetLayout for Hexagon
-class HexagonTargetLayout final : public TargetLayout<ELF32LE> {
-public:
-  enum HexagonSectionOrder {
-    ORDER_SDATA = 205
-  };
-
-  HexagonTargetLayout(HexagonLinkingContext &ctx)
-      : TargetLayout(ctx), _sdataSection(ctx) {}
-
-  /// \brief Return the section order for a input section
-  TargetLayout::SectionOrder
-  getSectionOrder(StringRef name, int32_t contentType,
-                  int32_t contentPermissions) override {
-    if (contentType == DefinedAtom::typeDataFast ||
-        contentType == DefinedAtom::typeZeroFillFast)
-      return ORDER_SDATA;
-    return TargetLayout::getSectionOrder(name, contentType, contentPermissions);
-  }
-
-  /// \brief Return the appropriate input section name.
-  StringRef getInputSectionName(const DefinedAtom *da) const override {
-    switch (da->contentType()) {
-    case DefinedAtom::typeDataFast:
-    case DefinedAtom::typeZeroFillFast:
-      return ".sdata";
-    default:
-      break;
-    }
-    return TargetLayout::getInputSectionName(da);
-  }
-
-  /// \brief Gets or creates a section.
-  AtomSection<ELF32LE> *
-  createSection(StringRef name, int32_t contentType,
-                DefinedAtom::ContentPermissions contentPermissions,
-                TargetLayout::SectionOrder sectionOrder) override {
-    if (contentType == DefinedAtom::typeDataFast ||
-        contentType == DefinedAtom::typeZeroFillFast)
-      return &_sdataSection;
-    return TargetLayout::createSection(name, contentType, contentPermissions,
-                                       sectionOrder);
-  }
-
-  /// \brief get the segment type for the section thats defined by the target
-  TargetLayout::SegmentType
-  getSegmentType(const Section<ELF32LE> *section) const override {
-    if (section->order() == ORDER_SDATA)
-      return PT_LOAD;
-    return TargetLayout::getSegmentType(section);
-  }
-
-  Section<ELF32LE> *getSDataSection() { return &_sdataSection; }
-
-  uint64_t getGOTSymAddr() {
-    std::call_once(_gotOnce, [this]() {
-      if (AtomLayout *got = findAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"))
-        _gotAddr = got->_virtualAddr;
-    });
-    return _gotAddr;
-  }
-
-private:
-  SDataSection _sdataSection;
-  uint64_t _gotAddr = 0;
-  std::once_flag _gotOnce;
-};
-
-/// \brief TargetHandler for Hexagon
-class HexagonTargetHandler final : public TargetHandler {
-public:
-  HexagonTargetHandler(HexagonLinkingContext &targetInfo);
-
-  const TargetRelocationHandler &getRelocationHandler() const override {
-    return *_relocationHandler;
-  }
-
-  std::unique_ptr<Reader> getObjReader() override {
-    return llvm::make_unique<ELFReader<HexagonELFFile>>(_ctx);
-  }
-
-  std::unique_ptr<Reader> getDSOReader() override {
-    return llvm::make_unique<ELFReader<DynamicFile<ELF32LE>>>(_ctx);
-  }
-
-  std::unique_ptr<Writer> getWriter() override;
-
-private:
-  HexagonLinkingContext &_ctx;
-  std::unique_ptr<HexagonTargetLayout> _targetLayout;
-  std::unique_ptr<HexagonTargetRelocationHandler> _relocationHandler;
-};
-
-void finalizeHexagonRuntimeAtomValues(HexagonTargetLayout &layout);
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/CMakeLists.txt b/lib/ReaderWriter/ELF/Mips/CMakeLists.txt
deleted file mode 100644
index fd52a08ad2d8..000000000000
--- a/lib/ReaderWriter/ELF/Mips/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-add_lld_library(lldMipsELFTarget
-  MipsAbiInfoHandler.cpp
-  MipsCtorsOrderPass.cpp
-  MipsELFFile.cpp
-  MipsELFWriters.cpp
-  MipsLinkingContext.cpp
-  MipsRelocationHandler.cpp
-  MipsRelocationPass.cpp
-  MipsSectionChunks.cpp
-  MipsTargetHandler.cpp
-  MipsTargetLayout.cpp
-  LINK_LIBS
-    lldELF
-    lldReaderWriter
-    lldCore
-    LLVMObject
-    LLVMSupport
-  )
diff --git a/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.cpp b/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.cpp
deleted file mode 100644
index ad4e62e64680..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.cpp
+++ /dev/null
@@ -1,675 +0,0 @@
-//===- lib/ReaderWriter/ELF/MipsAbiInfoHandler.cpp ------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MipsAbiInfoHandler.h"
-#include "lld/Core/Error.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/ELF.h"
-#include "llvm/Support/MipsABIFlags.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace lld;
-using namespace lld::elf;
-using namespace llvm;
-using namespace llvm::ELF;
-using namespace llvm::Mips;
-
-namespace {
-
-// The joined set of MIPS ISAs and MIPS ISA extensions.
-enum MipsISAs {
-  ArchNone,
-
-  // General ISAs
-  Arch1,
-  Arch2,
-  Arch3,
-  Arch4,
-  Arch5,
-  Arch32,
-  Arch32r2,
-  Arch32r3,
-  Arch32r5,
-  Arch32r6,
-  Arch64,
-  Arch64r2,
-  Arch64r3,
-  Arch64r5,
-  Arch64r6,
-
-  // CPU specific ISAs
-  Arch3900,
-  Arch4010,
-  Arch4100,
-  Arch4111,
-  Arch4120,
-  Arch4650,
-  Arch5400,
-  Arch5500,
-  Arch5900,
-  Arch9000,
-  Arch10000,
-  ArchLs2e,
-  ArchLs2f,
-  ArchLs3a,
-  ArchOcteon,
-  ArchOcteonP,
-  ArchOcteon2,
-  ArchOcteon3,
-  ArchSB1,
-  ArchXLR
-};
-
-struct MipsISATreeEdge {
-  MipsISAs child;
-  MipsISAs parent;
-};
-
-struct ElfArchPair {
-  uint32_t _elfFlag;
-  MipsISAs _arch;
-};
-
-struct AbiIsaArchPair {
-  uint8_t _isaLevel;
-  uint8_t _isaRev;
-  uint8_t _isaExt;
-  MipsISAs _arch;
-};
-}
-
-static const MipsISATreeEdge isaTree[] = {
-  // MIPS32R6 and MIPS64R6 are not compatible with other extensions
-
-  // MIPS64R2 extensions.
-  {ArchOcteon3, ArchOcteon2},
-  {ArchOcteon2, ArchOcteonP},
-  {ArchOcteonP, ArchOcteon},
-  {ArchOcteon,  Arch64r2},
-  {ArchLs3a,    Arch64r2},
-
-  // MIPS64 extensions.
-  {Arch64r2, Arch64},
-  {ArchSB1,  Arch64},
-  {ArchXLR,  Arch64},
-
-  // MIPS V extensions.
-  {Arch64, Arch5},
-
-  // R5000 extensions.
-  {Arch5500, Arch5400},
-
-  // MIPS IV extensions.
-  {Arch5, Arch4},
-  {Arch5400, Arch4},
-  {Arch9000, Arch4},
-
-  // VR4100 extensions.
-  {Arch4120, Arch4100},
-  {Arch4111, Arch4100},
-
-  // MIPS III extensions.
-  {ArchLs2e, Arch3},
-  {ArchLs2f, Arch3},
-  {Arch4650, Arch3},
-  {Arch4100, Arch3},
-  {Arch4010, Arch3},
-  {Arch5900, Arch3},
-  {Arch4,    Arch3},
-
-  // MIPS32 extensions.
-  {Arch32r2, Arch32},
-
-  // MIPS II extensions.
-  {Arch3, Arch2},
-  {Arch32, Arch2},
-
-  // MIPS I extensions.
-  {Arch3900, Arch1},
-  {Arch2,    Arch1},
-};
-
-// Conversion ELF arch flags => MipsISAs
-static const ElfArchPair elfArchPairs[] = {
-  {EF_MIPS_ARCH_1    | EF_MIPS_MACH_3900,    Arch3900},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4010,    Arch4010},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4100,    Arch4100},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4111,    Arch4111},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4120,    Arch4120},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4650,    Arch4650},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_5400,    Arch5400},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_5500,    Arch5500},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_5900,    Arch5900},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_9000,    Arch9000},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_LS2E,    ArchLs2e},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_LS2F,    ArchLs2f},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_LS3A,    ArchLs3a},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON,  ArchOcteon},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON2, ArchOcteon2},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON3, ArchOcteon3},
-  {EF_MIPS_ARCH_64   | EF_MIPS_MACH_SB1,     ArchSB1},
-  {EF_MIPS_ARCH_64   | EF_MIPS_MACH_XLR,     ArchXLR},
-  {EF_MIPS_ARCH_1,    Arch1},
-  {EF_MIPS_ARCH_2,    Arch2},
-  {EF_MIPS_ARCH_3,    Arch3},
-  {EF_MIPS_ARCH_4,    Arch4},
-  {EF_MIPS_ARCH_5,    Arch5},
-  {EF_MIPS_ARCH_32,   Arch32},
-  {EF_MIPS_ARCH_32R2, Arch32r2},
-  {EF_MIPS_ARCH_32R6, Arch32r6},
-  {EF_MIPS_ARCH_64,   Arch64},
-  {EF_MIPS_ARCH_64R2, Arch64r2},
-  {EF_MIPS_ARCH_64R6, Arch64r6}
-};
-
-// Conversion MipsISAs => ELF arch flags
-static const ElfArchPair archElfPairs[] = {
-  {EF_MIPS_ARCH_1,    Arch1},
-  {EF_MIPS_ARCH_2,    Arch2},
-  {EF_MIPS_ARCH_3,    Arch3},
-  {EF_MIPS_ARCH_4,    Arch4},
-  {EF_MIPS_ARCH_5,    Arch5},
-  {EF_MIPS_ARCH_32,   Arch32},
-  {EF_MIPS_ARCH_32R2, Arch32r2},
-  {EF_MIPS_ARCH_32R2, Arch32r3},
-  {EF_MIPS_ARCH_32R2, Arch32r5},
-  {EF_MIPS_ARCH_32R6, Arch32r6},
-  {EF_MIPS_ARCH_64,   Arch64},
-  {EF_MIPS_ARCH_64R2, Arch64r2},
-  {EF_MIPS_ARCH_64R2, Arch64r3},
-  {EF_MIPS_ARCH_64R2, Arch64r5},
-  {EF_MIPS_ARCH_64R6, Arch64r6},
-  {EF_MIPS_ARCH_1    | EF_MIPS_MACH_3900,    Arch3900},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4010,    Arch4010},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4100,    Arch4100},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4111,    Arch4111},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4120,    Arch4120},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_4650,    Arch4650},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_5400,    Arch5400},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_5500,    Arch5500},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_5900,    Arch5900},
-  {EF_MIPS_ARCH_4    | EF_MIPS_MACH_9000,    Arch9000},
-  {EF_MIPS_ARCH_4,                           Arch10000},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_LS2E,    ArchLs2e},
-  {EF_MIPS_ARCH_3    | EF_MIPS_MACH_LS2F,    ArchLs2f},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_LS3A,    ArchLs3a},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON,  ArchOcteon},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON,  ArchOcteonP},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON2, ArchOcteon2},
-  {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON3, ArchOcteon3},
-  {EF_MIPS_ARCH_64   | EF_MIPS_MACH_SB1,     ArchSB1},
-  {EF_MIPS_ARCH_64   | EF_MIPS_MACH_SB1,     ArchXLR}
-};
-
-// Conversion .MIPS.abiflags isa/level/extension <=> MipsISAs
-static const AbiIsaArchPair abiIsaArchPair[] = {
-  { 0, 0, 0, ArchNone},
-  { 1, 0, 0, Arch1},
-  { 2, 0, 0, Arch2},
-  { 3, 0, 0, Arch3},
-  { 4, 0, 0, Arch4},
-  { 5, 0, 0, Arch5},
-  {32, 1, 0, Arch32},
-  {32, 2, 0, Arch32r2},
-  {32, 3, 0, Arch32r3},
-  {32, 5, 0, Arch32r5},
-  {32, 6, 0, Arch32r6},
-  {64, 1, 0, Arch64},
-  {64, 2, 0, Arch64r2},
-  {64, 3, 0, Arch64r3},
-  {64, 5, 0, Arch64r5},
-  {64, 6, 0, Arch64r6},
-  { 1, 0, AFL_EXT_3900,  Arch3900},
-  { 3, 0, AFL_EXT_4010,  Arch4010},
-  { 3, 0, AFL_EXT_4100,  Arch4100},
-  { 3, 0, AFL_EXT_4111,  Arch4111},
-  { 3, 0, AFL_EXT_4120,  Arch4120},
-  { 3, 0, AFL_EXT_4650,  Arch4650},
-  { 4, 0, AFL_EXT_5400,  Arch5400},
-  { 4, 0, AFL_EXT_5500,  Arch5500},
-  { 3, 0, AFL_EXT_5900,  Arch5900},
-  { 4, 0, AFL_EXT_10000, Arch10000},
-  { 3, 0, AFL_EXT_LOONGSON_2E, ArchLs2e},
-  { 3, 0, AFL_EXT_LOONGSON_2F, ArchLs2f},
-  {64, 2, AFL_EXT_LOONGSON_3A, ArchLs3a},
-  {64, 2, AFL_EXT_OCTEON,  ArchOcteon},
-  {64, 2, AFL_EXT_OCTEON2, ArchOcteon2},
-  {64, 2, AFL_EXT_OCTEON3, ArchOcteon3},
-  {64, 1, AFL_EXT_SB1,     ArchSB1},
-  {64, 1, AFL_EXT_XLR,     ArchXLR}
-};
-
-static bool matchMipsISA(MipsISAs base, MipsISAs ext) {
-  if (base == ext)
-    return true;
-  if (base == Arch32 && matchMipsISA(Arch64, ext))
-    return true;
-  if (base == Arch32r2 && matchMipsISA(Arch64r2, ext))
-    return true;
-  for (const auto &edge : isaTree) {
-    if (ext == edge.child) {
-      ext = edge.parent;
-      if (ext == base)
-        return true;
-    }
-  }
-  return false;
-}
-
-static bool is32BitElfFlags(unsigned flags) {
-  if (flags & EF_MIPS_32BITMODE)
-    return true;
-
-  unsigned arch = flags & EF_MIPS_ARCH;
-  if (arch == EF_MIPS_ARCH_1 || arch == EF_MIPS_ARCH_2 ||
-      arch == EF_MIPS_ARCH_32 || arch == EF_MIPS_ARCH_32R2 ||
-      arch == EF_MIPS_ARCH_32R6)
-    return true;
-
-  unsigned abi = flags & EF_MIPS_ABI;
-  if (abi == EF_MIPS_ABI_O32 || abi == EF_MIPS_ABI_EABI32)
-    return true;
-
-  return false;
-}
-
-static ErrorOr<MipsISAs> headerFlagsToIsa(uint32_t flags) {
-  uint32_t arch = flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
-  for (const auto &p : elfArchPairs)
-    if (p._elfFlag == arch)
-      return p._arch;
-  return make_dynamic_error_code(
-      StringRef("Unknown EF_MIPS_ARCH | EF_MIPS_MACH flags (0x") +
-      Twine::utohexstr(arch) + ")");
-}
-
-static uint32_t isaToHeaderFlags(unsigned isa) {
-  for (const auto &p : archElfPairs)
-    if (p._arch == isa)
-      return p._elfFlag;
-  llvm_unreachable("Unknown MIPS ISA");
-}
-
-static ErrorOr<uint32_t> flagsToAses(uint32_t flags) {
-  uint32_t ases = flags & EF_MIPS_ARCH_ASE;
-  switch (ases) {
-  case 0:
-    return 0;
-  case EF_MIPS_MICROMIPS:
-    return AFL_ASE_MICROMIPS;
-  case EF_MIPS_ARCH_ASE_M16:
-    return AFL_ASE_MIPS16;
-  case EF_MIPS_ARCH_ASE_MDMX:
-    return AFL_ASE_MDMX;
-  default:
-    return make_dynamic_error_code(
-        StringRef("Unknown EF_MIPS_ARCH_ASE flag (0x") +
-        Twine::utohexstr(ases) + ")");
-  }
-}
-
-static uint32_t asesToFlags(uint32_t ases) {
-  switch (ases) {
-  case AFL_ASE_MICROMIPS:
-    return EF_MIPS_MICROMIPS;
-  case AFL_ASE_MIPS16:
-    return EF_MIPS_ARCH_ASE_M16;
-  case AFL_ASE_MDMX:
-    return EF_MIPS_ARCH_ASE_MDMX;
-  default:
-    return 0;
-  }
-}
-
-static ErrorOr<MipsISAs> sectionFlagsToIsa(uint8_t isaLevel, uint8_t isaRev,
-                                           uint8_t isaExt) {
-  for (const auto &p : abiIsaArchPair)
-    if (p._isaLevel == isaLevel && p._isaRev == isaRev && p._isaExt == isaExt)
-      return p._arch;
-  return make_dynamic_error_code(
-      StringRef("Unknown ISA level/revision/extension ") + Twine(isaLevel) +
-      "/" + Twine(isaRev) + "/" + Twine(isaExt));
-}
-
-static std::tuple<uint8_t, uint8_t, uint32_t> isaToSectionFlags(unsigned isa) {
-  for (const auto &p : abiIsaArchPair)
-    if (p._arch == isa)
-      return std::make_tuple(p._isaLevel, p._isaRev, p._isaExt);
-  llvm_unreachable("Unknown MIPS ISA");
-}
-
-static bool checkCompatibility(const MipsAbiFlags &hdr,
-                               const MipsAbiFlags &sec) {
-  uint32_t secIsa = ArchNone;
-  switch (sec._isa) {
-  case Arch32r3:
-  case Arch32r5:
-    secIsa = Arch32r2;
-    break;
-  case Arch64r3:
-  case Arch64r5:
-    secIsa = Arch64r2;
-    break;
-  default:
-    secIsa = sec._isa;
-    break;
-  }
-  if (secIsa != hdr._isa) {
-    llvm::errs() << "inconsistent ISA between .MIPS.abiflags "
-                    "and ELF header e_flags field\n";
-    return false;
-  }
-  if ((sec._ases & hdr._ases) != hdr._ases) {
-    llvm::errs() << "inconsistent ASEs between .MIPS.abiflags "
-                    "and ELF header e_flags field\n";
-    return false;
-  }
-  return true;
-}
-
-static int compareFpAbi(uint32_t fpA, uint32_t fpB) {
-  if (fpA == fpB)
-    return 0;
-  if (fpB == Val_GNU_MIPS_ABI_FP_ANY)
-    return 1;
-  if (fpB == Val_GNU_MIPS_ABI_FP_64A && fpA == Val_GNU_MIPS_ABI_FP_64)
-    return 1;
-  if (fpB != Val_GNU_MIPS_ABI_FP_XX)
-    return -1;
-  if (fpA == Val_GNU_MIPS_ABI_FP_DOUBLE || fpA == Val_GNU_MIPS_ABI_FP_64 ||
-      fpA == Val_GNU_MIPS_ABI_FP_64A)
-    return 1;
-  return -1;
-}
-
-static StringRef getFpAbiName(uint32_t fpAbi) {
-  switch (fpAbi) {
-  case Val_GNU_MIPS_ABI_FP_ANY:
-    return "<any>";
-  case Val_GNU_MIPS_ABI_FP_DOUBLE:
-    return "-mdouble-float";
-  case Val_GNU_MIPS_ABI_FP_SINGLE:
-    return "-msingle-float";
-  case Val_GNU_MIPS_ABI_FP_SOFT:
-    return "-msoft-float";
-  case Val_GNU_MIPS_ABI_FP_OLD_64:
-    return "-mips32r2 -mfp64 (old)";
-  case Val_GNU_MIPS_ABI_FP_XX:
-    return "-mfpxx";
-  case Val_GNU_MIPS_ABI_FP_64:
-    return "-mgp32 -mfp64";
-  case Val_GNU_MIPS_ABI_FP_64A:
-    return "-mgp32 -mfp64 -mno-odd-spreg";
-  default:
-    return "<unknown>";
-  }
-}
-
-static uint32_t selectFpAbiFlag(uint32_t oldFp, uint32_t newFp) {
-  if (compareFpAbi(newFp, oldFp) >= 0)
-    return newFp;
-  if (compareFpAbi(oldFp, newFp) < 0)
-    llvm::errs() << "FP ABI " << getFpAbiName(oldFp) << " is incompatible with "
-                 << getFpAbiName(newFp) << "\n";
-  return oldFp;
-}
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> bool MipsAbiInfoHandler<ELFT>::isMicroMips() const {
-  assert(_abiFlags.hasValue());
-  return _abiFlags->_ases & AFL_ASE_MICROMIPS;
-}
-
-template <class ELFT> bool MipsAbiInfoHandler<ELFT>::isMipsR6() const {
-  assert(_abiFlags.hasValue());
-  return _abiFlags->_isa == Arch32r6 || _abiFlags->_isa == Arch64r6;
-}
-
-template <class ELFT> bool MipsAbiInfoHandler<ELFT>::isFp64() const {
-  assert(_abiFlags.hasValue());
-  return _abiFlags->_fpAbi == Val_GNU_MIPS_ABI_FP_64 ||
-         _abiFlags->_fpAbi == Val_GNU_MIPS_ABI_FP_64A;
-}
-
-template <class ELFT> bool MipsAbiInfoHandler<ELFT>::isCPicOnly() const {
-  assert(_abiFlags.hasValue());
-  return _abiFlags->_isCPic && !_abiFlags->_isPic;
-}
-
-template <class ELFT> uint32_t MipsAbiInfoHandler<ELFT>::getFlags() const {
-  std::lock_guard<std::mutex> lock(_mutex);
-  uint32_t flags = 0;
-  if (_abiFlags.hasValue()) {
-    flags |= isaToHeaderFlags(_abiFlags->_isa);
-    flags |= asesToFlags(_abiFlags->_ases);
-    flags |= _abiFlags->_abi;
-    flags |= _abiFlags->_isPic ? EF_MIPS_PIC : 0u;
-    flags |= _abiFlags->_isCPic ? EF_MIPS_CPIC : 0u;
-    flags |= _abiFlags->_isNoReorder ? EF_MIPS_NOREORDER : 0u;
-    flags |= _abiFlags->_is32BitMode ? EF_MIPS_32BITMODE : 0u;
-    flags |= _abiFlags->_isNan2008 ? EF_MIPS_NAN2008 : 0u;
-  }
-  return flags;
-}
-
-template <class ELFT>
-llvm::Optional<typename MipsAbiInfoHandler<ELFT>::Elf_Mips_RegInfo>
-MipsAbiInfoHandler<ELFT>::getRegistersMask() const {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _regMask;
-}
-
-template <class ELFT>
-llvm::Optional<typename MipsAbiInfoHandler<ELFT>::Elf_Mips_ABIFlags>
-MipsAbiInfoHandler<ELFT>::getAbiFlags() const {
-  std::lock_guard<std::mutex> lock(_mutex);
-  if (!_hasAbiSection)
-    return llvm::Optional<Elf_Mips_ABIFlags>();
-
-  Elf_Mips_ABIFlags sec;
-  sec.version = 0;
-  std::tie(sec.isa_level, sec.isa_rev, sec.isa_ext) =
-      isaToSectionFlags(_abiFlags->_isa);
-  sec.gpr_size = _abiFlags->_gprSize;
-  sec.cpr1_size = _abiFlags->_cpr1Size;
-  sec.cpr2_size = _abiFlags->_cpr2Size;
-  sec.fp_abi = _abiFlags->_fpAbi;
-  sec.ases = _abiFlags->_ases;
-  sec.flags1 = _abiFlags->_flags1;
-  sec.flags2 = 0;
-  return sec;
-}
-
-template <class ELFT> MipsAbi MipsAbiInfoHandler<ELFT>::getAbi() const {
-  if (!_abiFlags.hasValue())
-    return ELFT::Is64Bits ? MipsAbi::N64 : MipsAbi::O32;
-  switch (_abiFlags->_abi & (EF_MIPS_ABI_O32 | EF_MIPS_ABI2)) {
-  case EF_MIPS_ABI_O32:
-    return MipsAbi::O32;
-  case EF_MIPS_ABI2:
-    return MipsAbi::N32;
-  case 0:
-    return MipsAbi::N64;
-  default:
-    llvm_unreachable("Unknown ABI flag");
-  }
-}
-
-template <class ELFT>
-std::error_code
-MipsAbiInfoHandler<ELFT>::mergeFlags(uint32_t newFlags,
-                                     const Elf_Mips_ABIFlags *newSec) {
-  std::lock_guard<std::mutex> lock(_mutex);
-
-  ErrorOr<MipsAbiFlags> abiFlags = createAbiFlags(newFlags, newSec);
-  if (auto ec = abiFlags.getError())
-    return ec;
-
-  // We support three ABI: O32, N32, and N64. The last one does not have
-  // the corresponding ELF flag.
-  if (ELFT::Is64Bits) {
-    if (abiFlags->_abi)
-      return make_dynamic_error_code("Unsupported ABI");
-  } else {
-    if (!(abiFlags->_abi & (EF_MIPS_ABI_O32 | EF_MIPS_ABI2)))
-      return make_dynamic_error_code("Unsupported ABI");
-  }
-
-  // ... and still do not support MIPS-16 extension.
-  if (abiFlags->_ases & AFL_ASE_MIPS16)
-    return make_dynamic_error_code("Unsupported extension: MIPS16");
-
-  // PIC code is inherently CPIC and may not set CPIC flag explicitly.
-  // Ensure that this flag will exist in the linked file.
-  if (abiFlags->_isPic)
-    abiFlags->_isCPic = true;
-
-  // If the old set of flags is empty, use the new one as a result.
-  if (!_abiFlags.hasValue()) {
-    _abiFlags = *abiFlags;
-    return std::error_code();
-  }
-
-  // Check ABI compatibility.
-  if (abiFlags->_abi != _abiFlags->_abi)
-    return make_dynamic_error_code("Linking modules with incompatible ABI");
-
-  // Check PIC / CPIC flags compatibility.
-  if (abiFlags->_isCPic != _abiFlags->_isCPic)
-    llvm::errs() << "lld warning: linking abicalls and non-abicalls files\n";
-
-  if (!abiFlags->_isPic)
-    _abiFlags->_isPic = false;
-  if (abiFlags->_isCPic)
-    _abiFlags->_isCPic = true;
-
-  // Check mixing -mnan=2008 / -mnan=legacy modules.
-  if (abiFlags->_isNan2008 != _abiFlags->_isNan2008)
-    return make_dynamic_error_code(
-        "Linking -mnan=2008 and -mnan=legacy modules");
-
-  // Check ISA compatibility and update the extension flag.
-  if (!matchMipsISA(MipsISAs(abiFlags->_isa), MipsISAs(_abiFlags->_isa))) {
-    if (!matchMipsISA(MipsISAs(_abiFlags->_isa), MipsISAs(abiFlags->_isa)))
-      return make_dynamic_error_code("Linking modules with incompatible ISA");
-    _abiFlags->_isa = abiFlags->_isa;
-  }
-
-  _abiFlags->_ases |= abiFlags->_ases;
-  _abiFlags->_isNoReorder = _abiFlags->_isNoReorder || abiFlags->_isNoReorder;
-  _abiFlags->_is32BitMode = _abiFlags->_is32BitMode || abiFlags->_is32BitMode;
-
-  _abiFlags->_fpAbi = selectFpAbiFlag(_abiFlags->_fpAbi, abiFlags->_fpAbi);
-  _abiFlags->_gprSize = std::max(_abiFlags->_gprSize, abiFlags->_gprSize);
-  _abiFlags->_cpr1Size = std::max(_abiFlags->_cpr1Size, abiFlags->_cpr1Size);
-  _abiFlags->_cpr2Size = std::max(_abiFlags->_cpr2Size, abiFlags->_cpr2Size);
-  _abiFlags->_flags1 |= abiFlags->_flags1;
-
-  return std::error_code();
-}
-
-template <class ELFT>
-void MipsAbiInfoHandler<ELFT>::mergeRegistersMask(
-    const Elf_Mips_RegInfo &info) {
-  std::lock_guard<std::mutex> lock(_mutex);
-  if (!_regMask.hasValue()) {
-    _regMask = info;
-    return;
-  }
-  _regMask->ri_gprmask = _regMask->ri_gprmask | info.ri_gprmask;
-  _regMask->ri_cprmask[0] = _regMask->ri_cprmask[0] | info.ri_cprmask[0];
-  _regMask->ri_cprmask[1] = _regMask->ri_cprmask[1] | info.ri_cprmask[1];
-  _regMask->ri_cprmask[2] = _regMask->ri_cprmask[2] | info.ri_cprmask[2];
-  _regMask->ri_cprmask[3] = _regMask->ri_cprmask[3] | info.ri_cprmask[3];
-}
-
-template <class ELFT>
-ErrorOr<MipsAbiFlags>
-MipsAbiInfoHandler<ELFT>::createAbiFlags(uint32_t flags,
-                                         const Elf_Mips_ABIFlags *sec) {
-  ErrorOr<MipsAbiFlags> hdrFlags = createAbiFromHeaderFlags(flags);
-  if (auto ec = hdrFlags.getError())
-    return ec;
-  if (!sec)
-    return *hdrFlags;
-  ErrorOr<MipsAbiFlags> secFlags = createAbiFromSection(*sec);
-  if (auto ec = secFlags.getError())
-    return ec;
-  if (!checkCompatibility(*hdrFlags, *secFlags))
-    return *hdrFlags;
-
-  _hasAbiSection = true;
-
-  secFlags->_abi = hdrFlags->_abi;
-  secFlags->_isPic = hdrFlags->_isPic;
-  secFlags->_isCPic = hdrFlags->_isCPic;
-  secFlags->_isNoReorder = hdrFlags->_isNoReorder;
-  secFlags->_is32BitMode = hdrFlags->_is32BitMode;
-  secFlags->_isNan2008 = hdrFlags->_isNan2008;
-  return *secFlags;
-}
-
-template <class ELFT>
-ErrorOr<MipsAbiFlags>
-MipsAbiInfoHandler<ELFT>::createAbiFromHeaderFlags(uint32_t flags) {
-  MipsAbiFlags abi;
-  ErrorOr<MipsISAs> isa = headerFlagsToIsa(flags);
-  if (auto ec = isa.getError())
-    return ec;
-  abi._isa = *isa;
-
-  abi._fpAbi = Val_GNU_MIPS_ABI_FP_ANY;
-  abi._cpr1Size = AFL_REG_NONE;
-  abi._cpr2Size = AFL_REG_NONE;
-  abi._gprSize = is32BitElfFlags(flags) ? AFL_REG_32 : AFL_REG_64;
-
-  ErrorOr<uint32_t> ases = flagsToAses(flags);
-  if (auto ec = ases.getError())
-    return ec;
-  abi._ases = *ases;
-  abi._flags1 = 0;
-  abi._abi = flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
-  abi._isPic = flags & EF_MIPS_PIC;
-  abi._isCPic = flags & EF_MIPS_CPIC;
-  abi._isNoReorder = flags & EF_MIPS_NOREORDER;
-  abi._is32BitMode = flags & EF_MIPS_32BITMODE;
-  abi._isNan2008 = flags & EF_MIPS_NAN2008;
-  return abi;
-}
-
-template <class ELFT>
-ErrorOr<MipsAbiFlags>
-MipsAbiInfoHandler<ELFT>::createAbiFromSection(const Elf_Mips_ABIFlags &sec) {
-  MipsAbiFlags abi;
-  ErrorOr<MipsISAs> isa =
-      sectionFlagsToIsa(sec.isa_level, sec.isa_rev, sec.isa_ext);
-  if (auto ec = isa.getError())
-    return ec;
-  abi._isa = *isa;
-  abi._fpAbi = sec.fp_abi;
-  abi._cpr1Size = sec.cpr1_size;
-  abi._cpr2Size = sec.cpr2_size;
-  abi._gprSize = sec.gpr_size;
-  abi._ases = sec.ases;
-  abi._flags1 = sec.flags1;
-  if (sec.flags2 != 0)
-    return make_dynamic_error_code("unexpected non-zero 'flags2' value");
-  return abi;
-}
-
-template class MipsAbiInfoHandler<ELF32BE>;
-template class MipsAbiInfoHandler<ELF32LE>;
-template class MipsAbiInfoHandler<ELF64BE>;
-template class MipsAbiInfoHandler<ELF64LE>;
-
-}
-}
diff --git a/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.h b/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.h
deleted file mode 100644
index 44da29f09214..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsAbiInfoHandler.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//===- lib/ReaderWriter/ELF/MipsAbiInfoHandler.h --------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_ABI_INFO_HANDLER_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_ABI_INFO_HANDLER_H
-
-#include "llvm/ADT/Optional.h"
-#include "llvm/Object/ELFTypes.h"
-#include "llvm/Support/ErrorOr.h"
-#include <mutex>
-#include <system_error>
-
-namespace lld {
-namespace elf {
-
-enum class MipsAbi { O32, N32, N64 };
-
-struct MipsAbiFlags {
-  unsigned _isa = 0;
-  unsigned _fpAbi = 0;
-  unsigned _ases = 0;
-  unsigned _flags1 = 0;
-  unsigned _gprSize = 0;
-  unsigned _cpr1Size = 0;
-  unsigned _cpr2Size = 0;
-
-  unsigned _abi = 0;
-
-  bool _isPic = false;
-  bool _isCPic = false;
-  bool _isNoReorder = false;
-  bool _is32BitMode = false;
-  bool _isNan2008 = false;
-};
-
-template <class ELFT> class MipsAbiInfoHandler {
-public:
-  typedef llvm::object::Elf_Mips_RegInfo<ELFT> Elf_Mips_RegInfo;
-  typedef llvm::object::Elf_Mips_ABIFlags<ELFT> Elf_Mips_ABIFlags;
-
-  MipsAbiInfoHandler() = default;
-
-  bool hasMipsAbiSection() const { return _hasAbiSection; }
-  bool isMicroMips() const;
-  bool isMipsR6() const;
-  bool isFp64() const;
-  bool isCPicOnly() const;
-
-  uint32_t getFlags() const;
-  llvm::Optional<Elf_Mips_RegInfo> getRegistersMask() const;
-  llvm::Optional<Elf_Mips_ABIFlags> getAbiFlags() const;
-
-  MipsAbi getAbi() const;
-
-  /// \brief Merge saved ELF header flags and the new set of flags.
-  std::error_code mergeFlags(uint32_t newFlags,
-                             const Elf_Mips_ABIFlags *newAbi);
-
-  /// \brief Merge saved and new sets of registers usage masks.
-  void mergeRegistersMask(const Elf_Mips_RegInfo &info);
-
-private:
-  mutable std::mutex _mutex;
-  bool _hasAbiSection = false;
-  llvm::Optional<MipsAbiFlags> _abiFlags;
-  llvm::Optional<Elf_Mips_RegInfo> _regMask;
-
-  llvm::ErrorOr<MipsAbiFlags> createAbiFlags(uint32_t flags,
-                                             const Elf_Mips_ABIFlags *sec);
-  static llvm::ErrorOr<MipsAbiFlags> createAbiFromHeaderFlags(uint32_t flags);
-  static llvm::ErrorOr<MipsAbiFlags>
-  createAbiFromSection(const Elf_Mips_ABIFlags &sec);
-};
-
-} // namespace elf
-} // namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.cpp b/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.cpp
deleted file mode 100644
index a7062813df42..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/Mips/CtorsOrderPass.cpp ------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MipsCtorsOrderPass.h"
-#include "lld/Core/Simple.h"
-#include <algorithm>
-#include <climits>
-
-using namespace lld;
-using namespace lld::elf;
-
-static bool matchCrtObjName(StringRef objName, StringRef objPath) {
-  if (!objPath.endswith(".o"))
-    return false;
-
-  // check *<objName> case
-  objPath = objPath.drop_back(2);
-  if (objPath.endswith(objName))
-    return true;
-
-  // check *<objName>? case
-  return !objPath.empty() && objPath.drop_back(1).endswith(objName);
-}
-
-static int32_t getSectionPriority(StringRef path, StringRef sectionName) {
-  // Arrange .ctors/.dtors sections in the following order:
-  //   .ctors from crtbegin.o or crtbegin?.o
-  //   .ctors from regular object files
-  //   .ctors.* (sorted) from regular object files
-  //   .ctors from crtend.o or crtend?.o
-
-  if (matchCrtObjName("crtbegin", path))
-    return std::numeric_limits<int32_t>::min();
-  if (matchCrtObjName("crtend", path))
-    return std::numeric_limits<int32_t>::max();
-
-  StringRef num = sectionName.drop_front().rsplit('.').second;
-
-  int32_t priority = std::numeric_limits<int32_t>::min() + 1;
-  if (!num.empty())
-    num.getAsInteger(10, priority);
-
-  return priority;
-}
-
-std::error_code MipsCtorsOrderPass::perform(SimpleFile &f) {
-  auto definedAtoms = f.definedAtoms();
-
-  auto last = std::stable_partition(definedAtoms.begin(), definedAtoms.end(),
-                                    [](const DefinedAtom *atom) {
-    if (atom->sectionChoice() != DefinedAtom::sectionCustomRequired)
-      return false;
-
-    StringRef name = atom->customSectionName();
-    return name.startswith(".ctors") || name.startswith(".dtors");
-  });
-
-  std::stable_sort(definedAtoms.begin(), last,
-                   [](const DefinedAtom *left, const DefinedAtom *right) {
-    StringRef leftSec = left->customSectionName();
-    StringRef rightSec = right->customSectionName();
-
-    int32_t leftPriority = getSectionPriority(left->file().path(), leftSec);
-    int32_t rightPriority = getSectionPriority(right->file().path(), rightSec);
-
-    return leftPriority < rightPriority;
-  });
-
-  return std::error_code();
-}
diff --git a/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.h b/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.h
deleted file mode 100644
index 5b12b7de0fa2..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsCtorsOrderPass.h ---------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_CTORS_ORDER_PASS_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_CTORS_ORDER_PASS_H
-
-#include "lld/Core/Pass.h"
-
-namespace lld {
-namespace elf {
-/// \brief This pass sorts atoms in .{ctors,dtors}.<priority> sections.
-class MipsCtorsOrderPass : public Pass {
-public:
-  std::error_code perform(SimpleFile &mergedFile) override;
-};
-}
-}
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h b/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h
deleted file mode 100644
index 480c69cf4600..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h -----------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_DYNAMIC_TABLE_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_DYNAMIC_TABLE_H
-
-#include "TargetLayout.h"
-#include "SectionChunks.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> class MipsTargetLayout;
-
-template <class ELFT> class MipsDynamicTable : public DynamicTable<ELFT> {
-public:
-  MipsDynamicTable(const ELFLinkingContext &ctx, MipsTargetLayout<ELFT> &layout)
-      : DynamicTable<ELFT>(ctx, layout, ".dynamic",
-                           TargetLayout<ELFT>::ORDER_DYNAMIC),
-        _targetLayout(layout) {}
-
-  void createDefaultEntries() override {
-    DynamicTable<ELFT>::createDefaultEntries();
-
-    // Version id for the Runtime Linker Interface.
-    this->addEntry(DT_MIPS_RLD_VERSION, 1);
-
-    // The .rld_map section address.
-    if (this->_ctx.getOutputELFType() == ET_EXEC) {
-      _dt_rldmap = this->addEntry(DT_MIPS_RLD_MAP, 0);
-      _dt_rldmaprel = this->addEntry(DT_MIPS_RLD_MAP_REL, 0);
-    }
-
-    // MIPS flags.
-    this->addEntry(DT_MIPS_FLAGS, RHF_NOTPOT);
-
-    // The base address of the segment.
-    _dt_baseaddr = this->addEntry(DT_MIPS_BASE_ADDRESS, 0);
-
-    // Number of local global offset table entries.
-    _dt_localgot = this->addEntry(DT_MIPS_LOCAL_GOTNO, 0);
-
-    // Number of entries in the .dynsym section.
-    _dt_symtabno = this->addEntry(DT_MIPS_SYMTABNO, 0);
-
-    // The index of the first dynamic symbol table entry that corresponds
-    // to an entry in the global offset table.
-    _dt_gotsym = this->addEntry(DT_MIPS_GOTSYM, 0);
-
-    // Address of the .got section.
-    _dt_pltgot = this->addEntry(DT_PLTGOT, 0);
-  }
-
-  void doPreFlight() override {
-    DynamicTable<ELFT>::doPreFlight();
-
-    if (_targetLayout.findOutputSection(".MIPS.options")) {
-      _dt_options = this->addEntry(DT_MIPS_OPTIONS, 0);
-    }
-  }
-
-  void updateDynamicTable() override {
-    DynamicTable<ELFT>::updateDynamicTable();
-
-    // Assign the minimum segment address to the DT_MIPS_BASE_ADDRESS tag.
-    auto baseAddr = std::numeric_limits<uint64_t>::max();
-    for (auto si : _targetLayout.segments())
-      if (si->segmentType() != llvm::ELF::PT_NULL)
-        baseAddr = std::min(baseAddr, si->virtualAddr());
-    this->_entries[_dt_baseaddr].d_un.d_val = baseAddr;
-
-    auto &got = _targetLayout.getGOTSection();
-
-    this->_entries[_dt_symtabno].d_un.d_val = this->getSymbolTable()->size();
-    this->_entries[_dt_gotsym].d_un.d_val =
-        this->getSymbolTable()->size() - got.getGlobalCount();
-    this->_entries[_dt_localgot].d_un.d_val = got.getLocalCount();
-    this->_entries[_dt_pltgot].d_un.d_ptr = got.virtualAddr();
-
-    if (const auto *sec = _targetLayout.findOutputSection(".MIPS.options"))
-      this->_entries[_dt_options].d_un.d_ptr = sec->virtualAddr();
-
-    if (const auto *sec = _targetLayout.findOutputSection(".rld_map")) {
-      this->_entries[_dt_rldmap].d_un.d_ptr = sec->virtualAddr();
-      this->_entries[_dt_rldmaprel].d_un.d_ptr =
-          sec->virtualAddr() -
-          (this->virtualAddr() +
-           _dt_rldmaprel * sizeof(typename DynamicTable<ELFT>::Elf_Dyn));
-    }
-  }
-
-  int64_t getGotPltTag() override { return DT_MIPS_PLTGOT; }
-
-protected:
-  /// \brief Adjust the symbol's value for microMIPS code.
-  uint64_t getAtomVirtualAddress(const AtomLayout *al) const override {
-    if (const auto *da = dyn_cast<DefinedAtom>(al->_atom))
-      if (da->codeModel() == DefinedAtom::codeMipsMicro ||
-          da->codeModel() == DefinedAtom::codeMipsMicroPIC)
-        return al->_virtualAddr | 1;
-    return al->_virtualAddr;
-  }
-
-private:
-  std::size_t _dt_symtabno;
-  std::size_t _dt_localgot;
-  std::size_t _dt_gotsym;
-  std::size_t _dt_pltgot;
-  std::size_t _dt_baseaddr;
-  std::size_t _dt_options;
-  std::size_t _dt_rldmap;
-  std::size_t _dt_rldmaprel;
-  MipsTargetLayout<ELFT> &_targetLayout;
-};
-
-} // end namespace elf
-} // end namespace lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsELFFile.cpp b/lib/ReaderWriter/ELF/Mips/MipsELFFile.cpp
deleted file mode 100644
index b081b63d77f7..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsELFFile.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-//===- lib/ReaderWriter/ELF/MipsELFFile.cpp -------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MipsELFFile.h"
-#include "MipsTargetHandler.h"
-#include "llvm/ADT/StringExtras.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT>
-MipsELFDefinedAtom<ELFT>::MipsELFDefinedAtom(
-    const MipsELFFile<ELFT> &file, StringRef symbolName, StringRef sectionName,
-    const Elf_Sym *symbol, const Elf_Shdr *section,
-    ArrayRef<uint8_t> contentData, unsigned int referenceStart,
-    unsigned int referenceEnd, std::vector<ELFReference<ELFT> *> &referenceList)
-    : ELFDefinedAtom<ELFT>(file, symbolName, sectionName, symbol, section,
-                           contentData, referenceStart, referenceEnd,
-                           referenceList) {}
-
-template <class ELFT>
-const MipsELFFile<ELFT> &MipsELFDefinedAtom<ELFT>::file() const {
-  return static_cast<const MipsELFFile<ELFT> &>(this->_owningFile);
-}
-
-template <class ELFT>
-DefinedAtom::CodeModel MipsELFDefinedAtom<ELFT>::codeModel() const {
-  switch (this->_symbol->st_other & llvm::ELF::STO_MIPS_MIPS16) {
-  case llvm::ELF::STO_MIPS_MIPS16:
-    return DefinedAtom::codeMips16;
-  case llvm::ELF::STO_MIPS_PIC:
-    return DefinedAtom::codeMipsPIC;
-  case llvm::ELF::STO_MIPS_MICROMIPS:
-    return DefinedAtom::codeMipsMicro;
-  case llvm::ELF::STO_MIPS_MICROMIPS | llvm::ELF::STO_MIPS_PIC:
-    return DefinedAtom::codeMipsMicroPIC;
-  default:
-    return DefinedAtom::codeNA;
-  }
-}
-
-template <class ELFT> bool MipsELFDefinedAtom<ELFT>::isPIC() const {
-  return file().isPIC() || codeModel() == DefinedAtom::codeMipsMicroPIC ||
-         codeModel() == DefinedAtom::codeMipsPIC;
-}
-
-template class MipsELFDefinedAtom<ELF32BE>;
-template class MipsELFDefinedAtom<ELF32LE>;
-template class MipsELFDefinedAtom<ELF64BE>;
-template class MipsELFDefinedAtom<ELF64LE>;
-
-template <class ELFT> static bool isMips64EL() {
-  return ELFT::Is64Bits && ELFT::TargetEndianness == llvm::support::little;
-}
-
-template <class ELFT, bool isRela>
-static uint32_t
-extractTag(const llvm::object::Elf_Rel_Impl<ELFT, isRela> &rel) {
-  return (rel.getType(isMips64EL<ELFT>()) & 0xffffff00) >> 8;
-}
-
-template <class ELFT>
-MipsELFReference<ELFT>::MipsELFReference(uint64_t symValue, const Elf_Rela &rel)
-    : ELFReference<ELFT>(&rel, rel.r_offset - symValue,
-                         Reference::KindArch::Mips,
-                         rel.getType(isMips64EL<ELFT>()) & 0xff,
-                         rel.getSymbol(isMips64EL<ELFT>())),
-      _tag(extractTag(rel)) {}
-
-template <class ELFT>
-MipsELFReference<ELFT>::MipsELFReference(uint64_t symValue, const Elf_Rel &rel)
-    : ELFReference<ELFT>(rel.r_offset - symValue, Reference::KindArch::Mips,
-                         rel.getType(isMips64EL<ELFT>()) & 0xff,
-                         rel.getSymbol(isMips64EL<ELFT>())),
-      _tag(extractTag(rel)) {}
-
-template class MipsELFReference<ELF32BE>;
-template class MipsELFReference<ELF32LE>;
-template class MipsELFReference<ELF64BE>;
-template class MipsELFReference<ELF64LE>;
-
-template <class ELFT>
-MipsELFFile<ELFT>::MipsELFFile(std::unique_ptr<MemoryBuffer> mb,
-                               ELFLinkingContext &ctx)
-    : ELFFile<ELFT>(std::move(mb), ctx) {}
-
-template <class ELFT> bool MipsELFFile<ELFT>::isPIC() const {
-  return this->_objFile->getHeader()->e_flags & llvm::ELF::EF_MIPS_PIC;
-}
-
-template <class ELFT> std::error_code MipsELFFile<ELFT>::doParse() {
-  if (std::error_code ec = ELFFile<ELFT>::doParse())
-    return ec;
-  // Retrieve some auxiliary data like GP value, TLS section address etc
-  // from the object file.
-  return readAuxData();
-}
-
-template <class ELFT>
-ELFDefinedAtom<ELFT> *MipsELFFile<ELFT>::createDefinedAtom(
-    StringRef symName, StringRef sectionName, const Elf_Sym *sym,
-    const Elf_Shdr *sectionHdr, ArrayRef<uint8_t> contentData,
-    unsigned int referenceStart, unsigned int referenceEnd,
-    std::vector<ELFReference<ELFT> *> &referenceList) {
-  return new (this->_readerStorage) MipsELFDefinedAtom<ELFT>(
-      *this, symName, sectionName, sym, sectionHdr, contentData, referenceStart,
-      referenceEnd, referenceList);
-}
-
-template <class ELFT>
-const typename MipsELFFile<ELFT>::Elf_Shdr *
-MipsELFFile<ELFT>::findSectionByType(uint64_t type) const {
-  for (const Elf_Shdr &section : this->_objFile->sections())
-    if (section.sh_type == type)
-      return &section;
-  return nullptr;
-}
-
-template <class ELFT>
-const typename MipsELFFile<ELFT>::Elf_Shdr *
-MipsELFFile<ELFT>::findSectionByFlags(uint64_t flags) const {
-  for (const Elf_Shdr &section : this->_objFile->sections())
-    if (section.sh_flags & flags)
-      return &section;
-  return nullptr;
-}
-
-template <class ELFT>
-ErrorOr<const typename MipsELFFile<ELFT>::Elf_Mips_RegInfo *>
-MipsELFFile<ELFT>::findRegInfoSec() const {
-  using namespace llvm::ELF;
-  if (const Elf_Shdr *sec = findSectionByType(SHT_MIPS_OPTIONS)) {
-    auto contents = this->getSectionContents(sec);
-    if (std::error_code ec = contents.getError())
-      return ec;
-
-    ArrayRef<uint8_t> raw = contents.get();
-    while (!raw.empty()) {
-      if (raw.size() < sizeof(Elf_Mips_Options))
-        return make_dynamic_error_code(
-            StringRef("Invalid size of MIPS_OPTIONS section"));
-
-      const auto *opt = reinterpret_cast<const Elf_Mips_Options *>(raw.data());
-      if (opt->kind == ODK_REGINFO)
-        return &opt->getRegInfo();
-      raw = raw.slice(opt->size);
-    }
-  } else if (const Elf_Shdr *sec = findSectionByType(SHT_MIPS_REGINFO)) {
-    auto contents = this->getSectionContents(sec);
-    if (std::error_code ec = contents.getError())
-      return ec;
-
-    ArrayRef<uint8_t> raw = contents.get();
-    if (raw.size() != sizeof(Elf_Mips_RegInfo))
-      return make_dynamic_error_code(
-          StringRef("Invalid size of MIPS_REGINFO section"));
-
-    return reinterpret_cast<const Elf_Mips_RegInfo *>(raw.data());
-  }
-  return nullptr;
-}
-
-template <class ELFT>
-ErrorOr<const typename MipsELFFile<ELFT>::Elf_Mips_ABIFlags *>
-MipsELFFile<ELFT>::findAbiFlagsSec() const {
-  const Elf_Shdr *sec = findSectionByType(SHT_MIPS_ABIFLAGS);
-  if (!sec)
-    return nullptr;
-
-  auto contents = this->getSectionContents(sec);
-  if (std::error_code ec = contents.getError())
-    return ec;
-
-  ArrayRef<uint8_t> raw = contents.get();
-  if (raw.size() != sizeof(Elf_Mips_ABIFlags))
-    return make_dynamic_error_code(
-        StringRef("Invalid size of MIPS_ABIFLAGS section"));
-
-  const auto *abi = reinterpret_cast<const Elf_Mips_ABIFlags *>(raw.data());
-  if (abi->version != 0)
-    return make_dynamic_error_code(
-        StringRef(".MIPS.abiflags section has unsupported version '") +
-        llvm::utostr(abi->version) + "'");
-
-  return abi;
-}
-
-template <class ELFT> std::error_code MipsELFFile<ELFT>::readAuxData() {
-  using namespace llvm::ELF;
-  if (const Elf_Shdr *sec = findSectionByFlags(SHF_TLS)) {
-    _tpOff = sec->sh_addr + TP_OFFSET;
-    _dtpOff = sec->sh_addr + DTP_OFFSET;
-  }
-
-  auto &handler =
-      static_cast<MipsTargetHandler<ELFT> &>(this->_ctx.getTargetHandler());
-  auto &abi = handler.getAbiInfoHandler();
-
-  ErrorOr<const Elf_Mips_RegInfo *> regInfoSec = findRegInfoSec();
-  if (auto ec = regInfoSec.getError())
-    return ec;
-  if (const Elf_Mips_RegInfo *regInfo = regInfoSec.get()) {
-    abi.mergeRegistersMask(*regInfo);
-    _gp0 = regInfo->ri_gp_value;
-  }
-
-  ErrorOr<const Elf_Mips_ABIFlags *> abiFlagsSec = findAbiFlagsSec();
-  if (auto ec = abiFlagsSec.getError())
-    return ec;
-
-  const Elf_Ehdr *hdr = this->_objFile->getHeader();
-  if (std::error_code ec = abi.mergeFlags(hdr->e_flags, abiFlagsSec.get()))
-    return ec;
-
-  return std::error_code();
-}
-
-template <class ELFT>
-void MipsELFFile<ELFT>::createRelocationReferences(
-    const Elf_Sym *symbol, ArrayRef<uint8_t> content,
-    range<const Elf_Rela *> rels) {
-  const auto value = this->getSymbolValue(symbol);
-  unsigned numInGroup = 0;
-  for (const auto &rel : rels) {
-    if (rel.r_offset < value || value + content.size() <= rel.r_offset) {
-      numInGroup = 0;
-      continue;
-    }
-    if (numInGroup > 0) {
-      auto &last =
-          *static_cast<MipsELFReference<ELFT> *>(this->_references.back());
-      if (last.offsetInAtom() + value == rel.r_offset) {
-        last.setTag(last.tag() |
-                    (rel.getType(isMips64EL<ELFT>()) << 8 * (numInGroup - 1)));
-        ++numInGroup;
-        continue;
-      }
-    }
-    auto r = new (this->_readerStorage) MipsELFReference<ELFT>(value, rel);
-    this->addReferenceToSymbol(r, symbol);
-    this->_references.push_back(r);
-    numInGroup = 1;
-  }
-}
-
-template <class ELFT>
-void MipsELFFile<ELFT>::createRelocationReferences(const Elf_Sym *symbol,
-                                                   ArrayRef<uint8_t> symContent,
-                                                   ArrayRef<uint8_t> secContent,
-                                                   const Elf_Shdr *relSec) {
-  const Elf_Shdr *symtab = *this->_objFile->getSection(relSec->sh_link);
-  auto rels = this->_objFile->rels(relSec);
-  const auto value = this->getSymbolValue(symbol);
-  for (const Elf_Rel *rit = rels.begin(), *eit = rels.end(); rit != eit;
-       ++rit) {
-    if (rit->r_offset < value || value + symContent.size() <= rit->r_offset)
-      continue;
-
-    auto r = new (this->_readerStorage) MipsELFReference<ELFT>(value, *rit);
-    this->addReferenceToSymbol(r, symbol);
-    this->_references.push_back(r);
-
-    auto addend = readAddend(*rit, secContent);
-    auto pairRelType = getPairRelocation(symtab, *rit);
-    if (pairRelType != llvm::ELF::R_MIPS_NONE) {
-      addend <<= 16;
-      auto mit = findMatchingRelocation(pairRelType, rit, eit);
-      if (mit != eit)
-        addend += int16_t(readAddend(*mit, secContent));
-      else
-        // FIXME (simon): Show detailed warning.
-        llvm::errs() << "lld warning: cannot matching LO16 relocation\n";
-    }
-    this->_references.back()->setAddend(addend);
-  }
-}
-
-template <class ELFT>
-static uint8_t
-getPrimaryType(const llvm::object::Elf_Rel_Impl<ELFT, false> &rel) {
-  return rel.getType(isMips64EL<ELFT>()) & 0xff;
-}
-
-template <class ELFT>
-Reference::Addend
-MipsELFFile<ELFT>::readAddend(const Elf_Rel &ri,
-                              const ArrayRef<uint8_t> content) const {
-  return readMipsRelocAddend<ELFT>(getPrimaryType(ri),
-                                   content.data() + ri.r_offset);
-}
-
-template <class ELFT>
-uint32_t MipsELFFile<ELFT>::getPairRelocation(const Elf_Shdr *symtab,
-                                              const Elf_Rel &rel) const {
-  switch (getPrimaryType(rel)) {
-  case llvm::ELF::R_MIPS_HI16:
-    return llvm::ELF::R_MIPS_LO16;
-  case llvm::ELF::R_MIPS_PCHI16:
-    return llvm::ELF::R_MIPS_PCLO16;
-  case llvm::ELF::R_MIPS_GOT16:
-    if (isLocalBinding(symtab, rel))
-      return llvm::ELF::R_MIPS_LO16;
-    break;
-  case llvm::ELF::R_MICROMIPS_HI16:
-    return llvm::ELF::R_MICROMIPS_LO16;
-  case llvm::ELF::R_MICROMIPS_GOT16:
-    if (isLocalBinding(symtab, rel))
-      return llvm::ELF::R_MICROMIPS_LO16;
-    break;
-  default:
-    // Nothing to do.
-    break;
-  }
-  return llvm::ELF::R_MIPS_NONE;
-}
-
-template <class ELFT>
-const typename MipsELFFile<ELFT>::Elf_Rel *
-MipsELFFile<ELFT>::findMatchingRelocation(uint32_t pairRelType,
-                                          const Elf_Rel *rit,
-                                          const Elf_Rel *eit) const {
-  return std::find_if(rit, eit, [&](const Elf_Rel &rel) {
-    return getPrimaryType(rel) == pairRelType &&
-           rel.getSymbol(isMips64EL<ELFT>()) ==
-               rit->getSymbol(isMips64EL<ELFT>());
-  });
-}
-
-template <class ELFT>
-bool MipsELFFile<ELFT>::isLocalBinding(const Elf_Shdr *symtab,
-                                       const Elf_Rel &rel) const {
-  return this->_objFile->getSymbol(symtab, rel.getSymbol(isMips64EL<ELFT>()))
-             ->getBinding() == llvm::ELF::STB_LOCAL;
-}
-
-template class MipsELFFile<ELF32BE>;
-template class MipsELFFile<ELF32LE>;
-template class MipsELFFile<ELF64BE>;
-template class MipsELFFile<ELF64LE>;
-
-} // elf
-} // lld
diff --git a/lib/ReaderWriter/ELF/Mips/MipsELFFile.h b/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
deleted file mode 100644
index 934934b539cc..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
+++ /dev/null
@@ -1,126 +0,0 @@
-//===- lib/ReaderWriter/ELF/MipsELFFile.h ---------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_ELF_FILE_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_ELF_FILE_H
-
-#include "ELFReader.h"
-#include "MipsLinkingContext.h"
-#include "MipsRelocationHandler.h"
-#include "llvm/ADT/STLExtras.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> class MipsELFFile;
-
-template <class ELFT>
-class MipsELFDefinedAtom : public ELFDefinedAtom<ELFT> {
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-
-public:
-  MipsELFDefinedAtom(const MipsELFFile<ELFT> &file, StringRef symbolName,
-                     StringRef sectionName, const Elf_Sym *symbol,
-                     const Elf_Shdr *section, ArrayRef<uint8_t> contentData,
-                     unsigned int referenceStart, unsigned int referenceEnd,
-                     std::vector<ELFReference<ELFT> *> &referenceList);
-
-  const MipsELFFile<ELFT>& file() const override;
-  DefinedAtom::CodeModel codeModel() const override;
-
-  bool isPIC() const;
-};
-
-template <class ELFT> class MipsELFReference : public ELFReference<ELFT> {
-  typedef llvm::object::Elf_Rel_Impl<ELFT, false> Elf_Rel;
-  typedef llvm::object::Elf_Rel_Impl<ELFT, true> Elf_Rela;
-
-public:
-  MipsELFReference(uint64_t symValue, const Elf_Rela &rel);
-  MipsELFReference(uint64_t symValue, const Elf_Rel &rel);
-
-  uint32_t tag() const override { return _tag; }
-  void setTag(uint32_t tag) { _tag = tag; }
-
-private:
-  uint32_t _tag;
-};
-
-template <class ELFT> class MipsELFFile : public ELFFile<ELFT> {
-public:
-  MipsELFFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx);
-
-  bool isPIC() const;
-
-  /// \brief gp register value stored in the .reginfo section.
-  int64_t getGP0() const { return _gp0; }
-
-  /// \brief .tdata section address plus fixed offset.
-  uint64_t getTPOffset() const { return _tpOff; }
-  uint64_t getDTPOffset() const { return _dtpOff; }
-
-protected:
-  std::error_code doParse() override;
-
-private:
-  typedef llvm::object::Elf_Sym_Impl<ELFT> Elf_Sym;
-  typedef llvm::object::Elf_Shdr_Impl<ELFT> Elf_Shdr;
-  typedef typename llvm::object::ELFFile<ELFT>::Elf_Rel Elf_Rel;
-  typedef typename llvm::object::ELFFile<ELFT>::Elf_Rela Elf_Rela;
-
-  enum { TP_OFFSET = 0x7000, DTP_OFFSET = 0x8000 };
-
-  int64_t _gp0 = 0;
-  uint64_t _tpOff = 0;
-  uint64_t _dtpOff = 0;
-
-  ELFDefinedAtom<ELFT> *
-  createDefinedAtom(StringRef symName, StringRef sectionName,
-                    const Elf_Sym *sym, const Elf_Shdr *sectionHdr,
-                    ArrayRef<uint8_t> contentData, unsigned int referenceStart,
-                    unsigned int referenceEnd,
-                    std::vector<ELFReference<ELFT> *> &referenceList) override;
-
-  void createRelocationReferences(const Elf_Sym *symbol,
-                                  ArrayRef<uint8_t> content,
-                                  range<const Elf_Rela *> rels) override;
-  void createRelocationReferences(const Elf_Sym *symbol,
-                                  ArrayRef<uint8_t> symContent,
-                                  ArrayRef<uint8_t> secContent,
-                                  const Elf_Shdr *RelSec) override;
-
-  const Elf_Shdr *findSectionByType(uint64_t type) const;
-  const Elf_Shdr *findSectionByFlags(uint64_t flags) const;
-
-  typedef typename llvm::object::ELFFile<ELFT>::Elf_Ehdr Elf_Ehdr;
-  typedef llvm::object::Elf_Mips_RegInfo<ELFT> Elf_Mips_RegInfo;
-  typedef llvm::object::Elf_Mips_Options<ELFT> Elf_Mips_Options;
-  typedef llvm::object::Elf_Mips_ABIFlags<ELFT> Elf_Mips_ABIFlags;
-
-  ErrorOr<const Elf_Mips_RegInfo *> findRegInfoSec() const;
-  ErrorOr<const Elf_Mips_ABIFlags*> findAbiFlagsSec() const;
-
-  std::error_code readAuxData();
-
-  Reference::Addend readAddend(const Elf_Rel &ri,
-                               const ArrayRef<uint8_t> content) const;
-
-  uint32_t getPairRelocation(const Elf_Shdr *Symtab, const Elf_Rel &rel) const;
-
-  const Elf_Rel *findMatchingRelocation(uint32_t pairRelType,
-                                        const Elf_Rel *rit,
-                                        const Elf_Rel *eit) const;
-
-  bool isLocalBinding(const Elf_Shdr *Symtab, const Elf_Rel &rel) const;
-};
-
-} // elf
-} // lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsELFWriters.cpp b/lib/ReaderWriter/ELF/Mips/MipsELFWriters.cpp
deleted file mode 100644
index b97a4f5a9070..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsELFWriters.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsELFWriters.cpp -----------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MipsDynamicTable.h"
-#include "MipsELFWriters.h"
-#include "MipsLinkingContext.h"
-#include "MipsTargetHandler.h"
-#include "MipsTargetLayout.h"
-
-namespace {
-class MipsDynamicAtom : public lld::elf::DynamicAtom {
-public:
-  MipsDynamicAtom(const lld::File &f) : DynamicAtom(f) {}
-
-  ContentPermissions permissions() const override { return permR__; }
-};
-}
-
-namespace lld {
-namespace elf {
-
-template <class ELFT>
-MipsELFWriter<ELFT>::MipsELFWriter(MipsLinkingContext &ctx,
-                                   MipsTargetLayout<ELFT> &targetLayout,
-                                   const MipsAbiInfoHandler<ELFT> &abiInfo)
-    : _ctx(ctx), _targetLayout(targetLayout), _abiInfo(abiInfo) {}
-
-template <class ELFT>
-void MipsELFWriter<ELFT>::setELFHeader(ELFHeader<ELFT> &elfHeader) {
-  elfHeader.e_version(1);
-  elfHeader.e_ident(llvm::ELF::EI_VERSION, llvm::ELF::EV_CURRENT);
-  elfHeader.e_ident(llvm::ELF::EI_OSABI, llvm::ELF::ELFOSABI_NONE);
-
-  unsigned char abiVer = 0;
-  if (_ctx.getOutputELFType() == ET_EXEC && _abiInfo.isCPicOnly())
-    abiVer = 1;
-  if (_abiInfo.isFp64())
-    abiVer = 3;
-
-  elfHeader.e_ident(llvm::ELF::EI_ABIVERSION, abiVer);
-  elfHeader.e_flags(_abiInfo.getFlags());
-}
-
-template <class ELFT>
-void MipsELFWriter<ELFT>::finalizeMipsRuntimeAtomValues() {
-  auto gotSection = _targetLayout.findOutputSection(".got");
-  auto got = gotSection ? gotSection->virtualAddr() : 0;
-  auto gp = gotSection ? got + _targetLayout.getGPOffset() : 0;
-
-  setAtomValue("_gp", gp);
-  setAtomValue("_gp_disp", gp);
-  setAtomValue("__gnu_local_gp", gp);
-
-  if (_ctx.isDynamic() && _ctx.getOutputELFType() == ET_EXEC)
-    setAtomValue("_DYNAMIC_LINKING", 1);
-}
-
-template <class ELFT>
-std::unique_ptr<RuntimeFile<ELFT>> MipsELFWriter<ELFT>::createRuntimeFile() {
-  auto file = llvm::make_unique<RuntimeFile<ELFT>>(_ctx, "Mips runtime file");
-  file->addAbsoluteAtom("_gp");
-  file->addAbsoluteAtom("_gp_disp");
-  file->addAbsoluteAtom("__gnu_local_gp");
-  if (_ctx.isDynamic()) {
-    file->addAtom(*new (file->allocator()) MipsDynamicAtom(*file));
-    if (_ctx.getOutputELFType() == ET_EXEC)
-      file->addAbsoluteAtom("_DYNAMIC_LINKING");
-  }
-  return file;
-}
-
-template <class ELFT>
-unique_bump_ptr<Section<ELFT>>
-MipsELFWriter<ELFT>::createOptionsSection(llvm::BumpPtrAllocator &alloc) {
-  typedef unique_bump_ptr<Section<ELFT>> Ptr;
-  const auto &regMask = _abiInfo.getRegistersMask();
-  if (!regMask.hasValue())
-    return Ptr();
-  return ELFT::Is64Bits
-             ? Ptr(new (alloc)
-                       MipsOptionsSection<ELFT>(_ctx, _targetLayout, *regMask))
-             : Ptr(new (alloc)
-                       MipsReginfoSection<ELFT>(_ctx, _targetLayout, *regMask));
-}
-
-template <class ELFT>
-unique_bump_ptr<Section<ELFT>>
-MipsELFWriter<ELFT>::createAbiFlagsSection(llvm::BumpPtrAllocator &alloc) {
-  typedef unique_bump_ptr<Section<ELFT>> Ptr;
-  const auto &abi = _abiInfo.getAbiFlags();
-  if (!abi.hasValue())
-    return Ptr();
-  return Ptr(new (alloc) MipsAbiFlagsSection<ELFT>(_ctx, _targetLayout, *abi));
-}
-
-template <class ELFT>
-void MipsELFWriter<ELFT>::setAtomValue(StringRef name, uint64_t value) {
-  AtomLayout *atom = _targetLayout.findAbsoluteAtom(name);
-  assert(atom);
-  atom->_virtualAddr = value;
-}
-
-template <class ELFT>
-MipsDynamicLibraryWriter<ELFT>::MipsDynamicLibraryWriter(
-    MipsLinkingContext &ctx, MipsTargetLayout<ELFT> &layout,
-    const MipsAbiInfoHandler<ELFT> &abiInfo)
-    : DynamicLibraryWriter<ELFT>(ctx, layout),
-      _writeHelper(ctx, layout, abiInfo), _targetLayout(layout) {}
-
-template <class ELFT>
-void MipsDynamicLibraryWriter<ELFT>::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  DynamicLibraryWriter<ELFT>::createImplicitFiles(result);
-  result.push_back(_writeHelper.createRuntimeFile());
-}
-
-template <class ELFT>
-void MipsDynamicLibraryWriter<ELFT>::finalizeDefaultAtomValues() {
-  DynamicLibraryWriter<ELFT>::finalizeDefaultAtomValues();
-  _writeHelper.finalizeMipsRuntimeAtomValues();
-}
-
-template <class ELFT>
-void MipsDynamicLibraryWriter<ELFT>::createDefaultSections() {
-  DynamicLibraryWriter<ELFT>::createDefaultSections();
-  _reginfo = _writeHelper.createOptionsSection(this->_alloc);
-  if (_reginfo)
-    this->_layout.addSection(_reginfo.get());
-  _abiFlags = _writeHelper.createAbiFlagsSection(this->_alloc);
-  if (_abiFlags)
-    this->_layout.addSection(_abiFlags.get());
-}
-
-template <class ELFT>
-std::error_code MipsDynamicLibraryWriter<ELFT>::setELFHeader() {
-  DynamicLibraryWriter<ELFT>::setELFHeader();
-  _writeHelper.setELFHeader(*this->_elfHeader);
-  return std::error_code();
-}
-
-template <class ELFT>
-unique_bump_ptr<SymbolTable<ELFT>>
-MipsDynamicLibraryWriter<ELFT>::createSymbolTable() {
-  return unique_bump_ptr<SymbolTable<ELFT>>(
-      new (this->_alloc) MipsSymbolTable<ELFT>(this->_ctx));
-}
-
-template <class ELFT>
-unique_bump_ptr<DynamicTable<ELFT>>
-MipsDynamicLibraryWriter<ELFT>::createDynamicTable() {
-  return unique_bump_ptr<DynamicTable<ELFT>>(
-      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _targetLayout));
-}
-
-template <class ELFT>
-unique_bump_ptr<DynamicSymbolTable<ELFT>>
-MipsDynamicLibraryWriter<ELFT>::createDynamicSymbolTable() {
-  return unique_bump_ptr<DynamicSymbolTable<ELFT>>(new (
-      this->_alloc) MipsDynamicSymbolTable<ELFT>(this->_ctx, _targetLayout));
-}
-
-template class MipsDynamicLibraryWriter<ELF32BE>;
-template class MipsDynamicLibraryWriter<ELF32LE>;
-template class MipsDynamicLibraryWriter<ELF64BE>;
-template class MipsDynamicLibraryWriter<ELF64LE>;
-
-template <class ELFT>
-MipsExecutableWriter<ELFT>::MipsExecutableWriter(
-    MipsLinkingContext &ctx, MipsTargetLayout<ELFT> &layout,
-    const MipsAbiInfoHandler<ELFT> &abiInfo)
-    : ExecutableWriter<ELFT>(ctx, layout), _writeHelper(ctx, layout, abiInfo),
-      _targetLayout(layout) {}
-
-template <class ELFT>
-std::error_code MipsExecutableWriter<ELFT>::setELFHeader() {
-  std::error_code ec = ExecutableWriter<ELFT>::setELFHeader();
-  if (ec)
-    return ec;
-
-  StringRef entryName = this->_ctx.entrySymbolName();
-  if (const AtomLayout *al = this->_layout.findAtomLayoutByName(entryName)) {
-    const auto *ea = cast<DefinedAtom>(al->_atom);
-    if (ea->codeModel() == DefinedAtom::codeMipsMicro ||
-        ea->codeModel() == DefinedAtom::codeMipsMicroPIC)
-      // Adjust entry symbol value if this symbol is microMIPS encoded.
-      this->_elfHeader->e_entry(al->_virtualAddr | 1);
-  }
-
-  _writeHelper.setELFHeader(*this->_elfHeader);
-  return std::error_code();
-}
-
-template <class ELFT>
-void MipsExecutableWriter<ELFT>::buildDynamicSymbolTable(const File &file) {
-  // MIPS ABI requires to add to dynsym even undefined symbols
-  // if they have a corresponding entries in a global part of GOT.
-  for (auto sec : this->_layout.sections())
-    if (auto section = dyn_cast<AtomSection<ELFT>>(sec))
-      for (const auto &atom : section->atoms()) {
-        if (_targetLayout.getGOTSection().hasGlobalGOTEntry(atom->_atom)) {
-          this->_dynamicSymbolTable->addSymbol(atom->_atom, section->ordinal(),
-                                               atom->_virtualAddr, atom);
-          continue;
-        }
-
-        const DefinedAtom *da = dyn_cast<const DefinedAtom>(atom->_atom);
-        if (!da)
-          continue;
-
-        if (da->dynamicExport() != DefinedAtom::dynamicExportAlways &&
-            !this->_ctx.isDynamicallyExportedSymbol(da->name()) &&
-            !(this->_ctx.shouldExportDynamic() &&
-              da->scope() == Atom::Scope::scopeGlobal))
-          continue;
-
-        this->_dynamicSymbolTable->addSymbol(atom->_atom, section->ordinal(),
-                                             atom->_virtualAddr, atom);
-      }
-
-  for (const UndefinedAtom *a : file.undefined())
-    // FIXME (simon): Consider to move this check to the
-    // MipsELFUndefinedAtom class method. That allows to
-    // handle more complex coditions in the future.
-    if (_targetLayout.getGOTSection().hasGlobalGOTEntry(a))
-      this->_dynamicSymbolTable->addSymbol(a, ELF::SHN_UNDEF);
-
-  // Skip our immediate parent class method
-  // ExecutableWriter<ELFT>::buildDynamicSymbolTable because we replaced it
-  // with our own version. Call OutputELFWriter directly.
-  OutputELFWriter<ELFT>::buildDynamicSymbolTable(file);
-}
-
-template <class ELFT>
-void MipsExecutableWriter<ELFT>::createImplicitFiles(
-    std::vector<std::unique_ptr<File>> &result) {
-  ExecutableWriter<ELFT>::createImplicitFiles(result);
-  result.push_back(_writeHelper.createRuntimeFile());
-}
-
-template <class ELFT>
-void MipsExecutableWriter<ELFT>::finalizeDefaultAtomValues() {
-  // Finalize the atom values that are part of the parent.
-  ExecutableWriter<ELFT>::finalizeDefaultAtomValues();
-  _writeHelper.finalizeMipsRuntimeAtomValues();
-}
-
-template <class ELFT> void MipsExecutableWriter<ELFT>::createDefaultSections() {
-  ExecutableWriter<ELFT>::createDefaultSections();
-  _reginfo = _writeHelper.createOptionsSection(this->_alloc);
-  if (_reginfo)
-    this->_layout.addSection(_reginfo.get());
-  _abiFlags = _writeHelper.createAbiFlagsSection(this->_alloc);
-  if (_abiFlags)
-    this->_layout.addSection(_abiFlags.get());
-}
-
-template <class ELFT>
-unique_bump_ptr<SymbolTable<ELFT>>
-MipsExecutableWriter<ELFT>::createSymbolTable() {
-  return unique_bump_ptr<SymbolTable<ELFT>>(
-      new (this->_alloc) MipsSymbolTable<ELFT>(this->_ctx));
-}
-
-/// \brief create dynamic table
-template <class ELFT>
-unique_bump_ptr<DynamicTable<ELFT>>
-MipsExecutableWriter<ELFT>::createDynamicTable() {
-  return unique_bump_ptr<DynamicTable<ELFT>>(
-      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _targetLayout));
-}
-
-/// \brief create dynamic symbol table
-template <class ELFT>
-unique_bump_ptr<DynamicSymbolTable<ELFT>>
-MipsExecutableWriter<ELFT>::createDynamicSymbolTable() {
-  return unique_bump_ptr<DynamicSymbolTable<ELFT>>(new (
-      this->_alloc) MipsDynamicSymbolTable<ELFT>(this->_ctx, _targetLayout));
-}
-
-template class MipsExecutableWriter<ELF32BE>;
-template class MipsExecutableWriter<ELF32LE>;
-template class MipsExecutableWriter<ELF64BE>;
-template class MipsExecutableWriter<ELF64LE>;
-
-} // elf
-} // lld
diff --git a/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h b/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h
deleted file mode 100644
index 31b84f947c95..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsELFWriters.h -------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_ELF_WRITERS_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_ELF_WRITERS_H
-
-#include "DynamicLibraryWriter.h"
-#include "ExecutableWriter.h"
-#include "MipsAbiInfoHandler.h"
-#include "MipsLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-template <class ELFT> class MipsTargetLayout;
-
-template <typename ELFT> class MipsELFWriter {
-public:
-  MipsELFWriter(MipsLinkingContext &ctx, MipsTargetLayout<ELFT> &targetLayout,
-                const MipsAbiInfoHandler<ELFT> &abiInfo);
-
-  void setELFHeader(ELFHeader<ELFT> &elfHeader);
-
-  void finalizeMipsRuntimeAtomValues();
-
-  std::unique_ptr<RuntimeFile<ELFT>> createRuntimeFile();
-  unique_bump_ptr<Section<ELFT>>
-  createOptionsSection(llvm::BumpPtrAllocator &alloc);
-  unique_bump_ptr<Section<ELFT>>
-  createAbiFlagsSection(llvm::BumpPtrAllocator &alloc);
-
-private:
-  MipsLinkingContext &_ctx;
-  MipsTargetLayout<ELFT> &_targetLayout;
-  const MipsAbiInfoHandler<ELFT> &_abiInfo;
-
-  void setAtomValue(StringRef name, uint64_t value);
-};
-
-template <class ELFT>
-class MipsDynamicLibraryWriter : public DynamicLibraryWriter<ELFT> {
-public:
-  MipsDynamicLibraryWriter(MipsLinkingContext &ctx,
-                           MipsTargetLayout<ELFT> &layout,
-                           const MipsAbiInfoHandler<ELFT> &abiInfo);
-
-protected:
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void finalizeDefaultAtomValues() override;
-  void createDefaultSections() override;
-
-  std::error_code setELFHeader() override;
-
-  unique_bump_ptr<SymbolTable<ELFT>> createSymbolTable() override;
-  unique_bump_ptr<DynamicTable<ELFT>> createDynamicTable() override;
-  unique_bump_ptr<DynamicSymbolTable<ELFT>> createDynamicSymbolTable() override;
-
-private:
-  MipsELFWriter<ELFT> _writeHelper;
-  MipsTargetLayout<ELFT> &_targetLayout;
-  unique_bump_ptr<Section<ELFT>> _reginfo;
-  unique_bump_ptr<Section<ELFT>> _abiFlags;
-};
-
-template <class ELFT>
-class MipsExecutableWriter : public ExecutableWriter<ELFT> {
-public:
-  MipsExecutableWriter(MipsLinkingContext &ctx, MipsTargetLayout<ELFT> &layout,
-                       const MipsAbiInfoHandler<ELFT> &abiInfo);
-
-protected:
-  void buildDynamicSymbolTable(const File &file) override;
-
-  // Add any runtime files and their atoms to the output
-  void createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
-
-  void finalizeDefaultAtomValues() override;
-  void createDefaultSections() override;
-  std::error_code setELFHeader() override;
-
-  unique_bump_ptr<SymbolTable<ELFT>> createSymbolTable() override;
-  unique_bump_ptr<DynamicTable<ELFT>> createDynamicTable() override;
-  unique_bump_ptr<DynamicSymbolTable<ELFT>> createDynamicSymbolTable() override;
-
-private:
-  MipsELFWriter<ELFT> _writeHelper;
-  MipsTargetLayout<ELFT> &_targetLayout;
-  unique_bump_ptr<Section<ELFT>> _reginfo;
-  unique_bump_ptr<Section<ELFT>> _abiFlags;
-};
-
-} // elf
-} // lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp b/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
deleted file mode 100644
index b6cdd5c1487c..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp -------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Atoms.h"
-#include "MipsCtorsOrderPass.h"
-#include "MipsLinkingContext.h"
-#include "MipsRelocationPass.h"
-#include "MipsTargetHandler.h"
-
-using namespace lld;
-using namespace lld::elf;
-
-std::unique_ptr<ELFLinkingContext>
-elf::createMipsLinkingContext(llvm::Triple triple) {
-  if (triple.getArch() == llvm::Triple::mips ||
-      triple.getArch() == llvm::Triple::mipsel ||
-      triple.getArch() == llvm::Triple::mips64 ||
-      triple.getArch() == llvm::Triple::mips64el)
-    return llvm::make_unique<MipsLinkingContext>(triple);
-  return nullptr;
-}
-
-static std::unique_ptr<TargetHandler> createTarget(llvm::Triple triple,
-                                                   MipsLinkingContext &ctx) {
-  switch (triple.getArch()) {
-  case llvm::Triple::mips:
-    return llvm::make_unique<MipsTargetHandler<ELF32BE>>(ctx);
-  case llvm::Triple::mipsel:
-    return llvm::make_unique<MipsTargetHandler<ELF32LE>>(ctx);
-  case llvm::Triple::mips64:
-    return llvm::make_unique<MipsTargetHandler<ELF64BE>>(ctx);
-  case llvm::Triple::mips64el:
-    return llvm::make_unique<MipsTargetHandler<ELF64LE>>(ctx);
-  default:
-    llvm_unreachable("Unhandled arch");
-  }
-}
-
-MipsLinkingContext::MipsLinkingContext(llvm::Triple triple)
-    : ELFLinkingContext(triple, createTarget(triple, *this)) {}
-
-uint64_t MipsLinkingContext::getBaseAddress() const {
-  if (_baseAddress != 0 || getOutputELFType() != llvm::ELF::ET_EXEC)
-    return _baseAddress;
-  switch (getAbi()) {
-  case MipsAbi::O32:
-    return 0x0400000;
-  case MipsAbi::N32:
-    return 0x10000000;
-  case MipsAbi::N64:
-    return 0x120000000;
-  }
-  llvm_unreachable("unknown MIPS ABI flag");
-}
-
-StringRef MipsLinkingContext::entrySymbolName() const {
-  if (_outputELFType == elf::ET_EXEC && _entrySymbolName.empty())
-    return "__start";
-  return _entrySymbolName;
-}
-
-StringRef MipsLinkingContext::getDefaultInterpreter() const {
-  switch (getAbi()) {
-  case MipsAbi::O32:
-    return "/lib/ld.so.1";
-  case MipsAbi::N32:
-    return "/lib32/ld.so.1";
-  case MipsAbi::N64:
-    return "/lib64/ld.so.1";
-  }
-  llvm_unreachable("unknown MIPS ABI flag");
-}
-
-void MipsLinkingContext::addPasses(PassManager &pm) {
-  auto pass = createMipsRelocationPass(*this);
-  if (pass)
-    pm.add(std::move(pass));
-  ELFLinkingContext::addPasses(pm);
-  pm.add(llvm::make_unique<elf::MipsCtorsOrderPass>());
-}
-
-bool MipsLinkingContext::isDynamicRelocation(const Reference &r) const {
-  if (r.kindNamespace() != Reference::KindNamespace::ELF)
-    return false;
-  assert(r.kindArch() == Reference::KindArch::Mips);
-  switch (r.kindValue()) {
-  case llvm::ELF::R_MIPS_COPY:
-  case llvm::ELF::R_MIPS_REL32:
-    return true;
-  case llvm::ELF::R_MIPS_TLS_DTPMOD32:
-  case llvm::ELF::R_MIPS_TLS_DTPREL32:
-  case llvm::ELF::R_MIPS_TLS_TPREL32:
-  case llvm::ELF::R_MIPS_TLS_DTPMOD64:
-  case llvm::ELF::R_MIPS_TLS_DTPREL64:
-  case llvm::ELF::R_MIPS_TLS_TPREL64:
-    return isDynamic();
-  default:
-    return false;
-  }
-}
-
-bool MipsLinkingContext::isCopyRelocation(const Reference &r) const {
-  if (r.kindNamespace() != Reference::KindNamespace::ELF)
-    return false;
-  assert(r.kindArch() == Reference::KindArch::Mips);
-  if (r.kindValue() == llvm::ELF::R_MIPS_COPY)
-    return true;
-  return false;
-}
-
-bool MipsLinkingContext::isPLTRelocation(const Reference &r) const {
-  if (r.kindNamespace() != Reference::KindNamespace::ELF)
-    return false;
-  assert(r.kindArch() == Reference::KindArch::Mips);
-  switch (r.kindValue()) {
-  case llvm::ELF::R_MIPS_JUMP_SLOT:
-    return true;
-  default:
-    return false;
-  }
-}
-
-bool MipsLinkingContext::isRelativeReloc(const Reference &r) const {
-  if (r.kindNamespace() != Reference::KindNamespace::ELF)
-    return false;
-  assert(r.kindArch() == Reference::KindArch::Mips);
-  switch (r.kindValue()) {
-  case llvm::ELF::R_MIPS_REL32:
-  case llvm::ELF::R_MIPS_GPREL16:
-  case llvm::ELF::R_MIPS_GPREL32:
-    return true;
-  default:
-    return false;
-  }
-}
-
-MipsAbi MipsLinkingContext::getAbi() const {
-  auto &handler = static_cast<MipsBaseTargetHandler &>(getTargetHandler());
-  return handler.getAbi();
-}
-
-const Registry::KindStrings kindStrings[] = {
-#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
-#include "llvm/Support/ELFRelocs/Mips.def"
-#undef ELF_RELOC
-  LLD_KIND_STRING_ENTRY(LLD_R_MIPS_GLOBAL_GOT),
-  LLD_KIND_STRING_ENTRY(LLD_R_MIPS_32_HI16),
-  LLD_KIND_STRING_ENTRY(LLD_R_MIPS_64_HI16),
-  LLD_KIND_STRING_ENTRY(LLD_R_MIPS_GLOBAL_26),
-  LLD_KIND_STRING_ENTRY(LLD_R_MIPS_STO_PLT),
-  LLD_KIND_STRING_ENTRY(LLD_R_MICROMIPS_GLOBAL_26_S1),
-  LLD_KIND_STRING_END
-};
-
-void MipsLinkingContext::registerRelocationNames(Registry &registry) {
-  registry.addKindTable(Reference::KindNamespace::ELF,
-                        Reference::KindArch::Mips, kindStrings);
-}
diff --git a/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h b/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
deleted file mode 100644
index 414d2c785e17..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h ---------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_MIPS_MIPS_LINKING_CONTEXT_H
-#define LLD_READER_WRITER_ELF_MIPS_MIPS_LINKING_CONTEXT_H
-
-#include "MipsAbiInfoHandler.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-
-namespace lld {
-namespace elf {
-
-/// \brief Mips internal references.
-enum {
-  /// \brief Do nothing but mark GOT entry as a global one.
-  LLD_R_MIPS_GLOBAL_GOT = 1024,
-  /// \brief Apply high 16 bits of symbol + addend.
-  LLD_R_MIPS_32_HI16 = 1025,
-  /// \brief The same as R_MIPS_26 but for global symbols.
-  LLD_R_MIPS_GLOBAL_26 = 1026,
-  /// \brief Represents a reference between PLT and dynamic symbol.
-  LLD_R_MIPS_STO_PLT = 1029,
-  /// \brief The same as R_MICROMIPS_26_S1 but for global symbols.
-  LLD_R_MICROMIPS_GLOBAL_26_S1 = 1030,
-  /// \brief Apply high 32+16 bits of symbol + addend.
-  LLD_R_MIPS_64_HI16 = 1031,
-};
-
-class MipsLinkingContext final : public ELFLinkingContext {
-public:
-  MipsLinkingContext(llvm::Triple triple);
-
-  void registerRelocationNames(Registry &r) override;
-  int getMachineType() const override { return llvm::ELF::EM_MIPS; }
-  uint64_t getBaseAddress() const override;
-  StringRef entrySymbolName() const override;
-  StringRef getDefaultInterpreter() const override;
-  void addPasses(PassManager &pm) override;
-  bool isRelaOutputFormat() const override { return false; }
-  bool isDynamicRelocation(const Reference &r) const override;
-  bool isCopyRelocation(const Reference &r) const override;
-  bool isPLTRelocation(const Reference &r) const override;
-  bool isRelativeReloc(const Reference &r) const override;
-
-  MipsAbi getAbi() const;
-};
-
-} // elf
-} // lld
-
-#endif
diff --git a/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp b/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
deleted file mode 100644
index c55a7a4116e6..000000000000
--- a/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp
+++ /dev/null
@@ -1,687 +0,0 @@
-//===- lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp ----------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MipsLinkingContext.h"
-#include "MipsRelocationHandler.h"
-#include "MipsTargetLayout.h"
-#include "llvm/Support/Format.h"
-
-using namespace lld;
-using namespace elf;
-using namespace llvm::ELF;
-using namespace llvm::support;
-
-namespace {
-enum class CrossJumpMode {
-  None,      // Not a jump or non-isa-cross jump
-  ToRegular, // cross isa jump to regular symbol
-  ToMicro,   // cross isa jump to microMips symbol
-  ToMicroJalr// cross isa jump to microMips symbol referenced by R_MIPS_JALR
-};
-
-typedef std::function<std::error_code(int64_t, bool)> OverflowChecker;
-
-static std::error_code dummyCheck(int64_t, bool) {
-  return std::error_code();
-}
-
-template <int BITS> static std::error_code signedCheck(int64_t res, bool) {
-  if (llvm::isInt<BITS>(res))
-    return std::error_code();
-  return make_out_of_range_reloc_error();
-}
-
-template <int BITS>
-static std::error_code gpDispCheck(int64_t res, bool isGpDisp) {
-  if (!isGpDisp || llvm::isInt<BITS>(res))
-    return std::error_code();
-  return make_out_of_range_reloc_error();
-}
-
-struct Mips