[lld] r241274 - [ELF] Remove dead code. NFC

[Simon Atanasyan]

Author: atanasyan
Date: Thu Jul  2 10:04:08 2015
New Revision: 241274

URL: http://llvm.org/viewvc/llvm-project?rev=241274&view=rev
Log:
[ELF] Remove dead code. NFC

Modified:
    lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h
    lld/trunk/lib/ReaderWriter/ELF/ELFFile.cpp

Modified: lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=241274&r1=241273&r2=241274&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h Thu Jul  2 10:04:08 2015
@@ -354,14 +354,6 @@ public:
   bool mipsPcRelEhRel() const { return _mipsPcRelEhRel; }
   void setMipsPcRelEhRel(bool value) { _mipsPcRelEhRel = value; }
 
-  /// Each time a reader reads a new file, this member function is called
-  /// with the file's ELF magics. This is supposed to "merge" all attributes
-  /// to generate output ELF file magic. This can also reject input files
-  /// if they conflict with previous input files.
-  virtual std::error_code mergeHeaderFlags(uint8_t fileClass, uint64_t flags) {
-    return std::error_code();
-  }
-
 protected:
   ELFLinkingContext(llvm::Triple triple, std::unique_ptr<TargetHandler> handler)
       : _triple(triple), _targetHandler(std::move(handler)) {}

Modified: lld/trunk/lib/ReaderWriter/ELF/ELFFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFFile.cpp?rev=241274&r1=241273&r2=241274&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFFile.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFFile.cpp Thu Jul  2 10:04:08 2015
@@ -138,14 +138,8 @@ std::error_code ELFFile<ELFT>::createAto
       if (std::error_code ec = sHdrOrErr.getError())
         return ec;
       auto sHdr = *sHdrOrErr;
-
-      auto sectionName = _objFile->getSectionName(sHdr);
-      if (std::error_code ec = sectionName.getError())
-        return ec;
-
       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) {
@@ -153,14 +147,8 @@ std::error_code ELFFile<ELFT>::createAto
       if (std::error_code ec = sHdrOrErr.getError())
         return ec;
       auto sHdr = *sHdrOrErr;
-
-      auto sectionName = _objFile->getSectionName(sHdr);
-      if (std::error_code ec = sectionName.getError())
-        return ec;
-
       auto ri = _objFile->rel_begin(&section);
       auto re = _objFile->rel_end(&section);
-
       _relocationReferences[sHdr] = make_range(ri, re);
       totalRelocs += std::distance(ri, re);
     } else {