[lld] r229030 - Remove class that really does nothing.

[Rui Ueyama]

Author: ruiu
Date: Thu Feb 12 20:34:08 2015
New Revision: 229030

URL: http://llvm.org/viewvc/llvm-project?rev=229030&view=rev
Log:
Remove class that really does nothing.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
    lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h
    lld/trunk/lib/ReaderWriter/ELF/TODO.txt
    lld/trunk/lib/ReaderWriter/ELF/TargetLayout.h

Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=229030&r1=229029&r2=229030&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Thu Feb 12 20:34:08 2015
@@ -326,16 +326,6 @@ protected:
   const ELFLinkingContext &_context;
 };
 
-/// \brief Handle linker scripts. TargetLayouts would derive
-/// from this class to override some of the functionalities.
-template<class ELFT>
-class ScriptLayout: public DefaultLayout<ELFT> {
-public:
-  ScriptLayout(const ELFLinkingContext &context)
-    : DefaultLayout<ELFT>(context)
-  {}
-};
-
 template <class ELFT>
 Layout::SectionOrder DefaultLayout<ELFT>::getSectionOrder(
     StringRef name, int32_t contentType, int32_t contentPermissions) {

Modified: lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h?rev=229030&r1=229029&r2=229030&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h Thu Feb 12 20:34:08 2015
@@ -30,7 +30,6 @@ namespace lld {
 namespace elf {
 
 template <typename ELFT> class DefaultLayout;
-template <typename ELFT> class ScriptLayout;
 
 /// \brief A segment can be divided into segment slices
 ///        depending on how the segments can be split

Modified: lld/trunk/lib/ReaderWriter/ELF/TODO.txt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/TODO.txt?rev=229030&r1=229029&r2=229030&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/TODO.txt (original)
+++ lld/trunk/lib/ReaderWriter/ELF/TODO.txt Thu Feb 12 20:34:08 2015
@@ -16,6 +16,4 @@ lib/ReaderWriter/ELF
 
 - Gnu linkonce sections.
 
-- ScriptLayout
-
 - Fix section flags as they appear in input (update content permissions)

Modified: lld/trunk/lib/ReaderWriter/ELF/TargetLayout.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/TargetLayout.h?rev=229030&r1=229029&r2=229030&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/TargetLayout.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/TargetLayout.h Thu Feb 12 20:34:08 2015
@@ -18,10 +18,10 @@ namespace elf {
 /// \brief The target can override certain functions in the DefaultLayout
 /// class so that the order, the name of the section and the segment type could
 /// be changed in the final layout
-template <class ELFT> class TargetLayout : public ScriptLayout<ELFT> {
+template <class ELFT> class TargetLayout : public DefaultLayout<ELFT> {
 public:
   TargetLayout(const ELFLinkingContext &context)
-      : ScriptLayout<ELFT>(context) {}
+      : DefaultLayout<ELFT>(context) {}
 };
 } // end namespace elf
 } // end namespace lld