From f6f3e2dd058930058b784ddd5ee483437f04afd3 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sun, 28 Feb 2016 02:22:24 +0000
Subject: [PATCH] Remove a few bits of elf from the old linker.

llvm-svn: 262164
---
 lld/include/lld/Core/File.h                    | 1 -
 lld/lib/Core/Resolver.cpp                      | 1 -
 lld/lib/Driver/Driver.cpp                      | 1 -
 lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp | 2 --
 4 files changed, 5 deletions(-)

diff --git a/lld/include/lld/Core/File.h b/lld/include/lld/Core/File.h
index 83b2fea..6473815 100644
--- a/lld/include/lld/Core/File.h
+++ b/lld/include/lld/Core/File.h
@@ -48,7 +48,6 @@ public:
     kindErrorObject,          ///< a error object file (.o)
     kindNormalizedObject,     ///< a normalized file (.o)
     kindMachObject,           ///< a MachO object file (.o)
-    kindELFObject,            ///< a ELF object file (.o)
     kindCEntryObject,         ///< a file for CEntries
     kindHeaderObject,         ///< a file for file headers
     kindEntryObject,          ///< a file for the entry
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp
index 337f6e4..5f70ae2 100644
--- a/lld/lib/Core/Resolver.cpp
+++ b/lld/lib/Core/Resolver.cpp
@@ -341,7 +341,6 @@ bool Resolver::resolveUndefines() {
     case File::kindErrorObject:
     case File::kindNormalizedObject:
     case File::kindMachObject:
-    case File::kindELFObject:
     case File::kindCEntryObject:
     case File::kindHeaderObject:
     case File::kindEntryObject:
diff --git a/lld/lib/Driver/Driver.cpp b/lld/lib/Driver/Driver.cpp
index 6a7a26b..6cc8c73 100644
--- a/lld/lib/Driver/Driver.cpp
+++ b/lld/lib/Driver/Driver.cpp
@@ -103,7 +103,6 @@ bool Driver::link(LinkingContext &ctx, raw_ostream &diagnostics) {
 
   // 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.
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index 3336a3e..e01130e 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -229,7 +229,6 @@ public:
 enum FileKinds {
   fileKindObjectAtoms, // atom based object file encoded in yaml
   fileKindArchive,     // static archive library encoded in yaml
-  fileKindObjectELF,   // ELF object files encoded in yaml
   fileKindObjectMachO  // mach-o object files encoded in yaml
 };
 
@@ -518,7 +517,6 @@ template <> struct ScalarEnumerationTraits<FileKinds> {
   static void enumeration(IO &io, FileKinds &value) {
     io.enumCase(value, "object",        fileKindObjectAtoms);
     io.enumCase(value, "archive",       fileKindArchive);
-    io.enumCase(value, "object-elf",    fileKindObjectELF);
     io.enumCase(value, "object-mach-o", fileKindObjectMachO);
   }
 };
-- 
2.7.4