From dcd61c2d145180cf67d77e1d4e96341e9135983d Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Fri, 13 Feb 2015 02:34:08 +0000
Subject: [PATCH] Remove class that really does nothing.

llvm-svn: 229030
---
 lld/lib/ReaderWriter/ELF/DefaultLayout.h | 10 ----------
 lld/lib/ReaderWriter/ELF/SegmentChunks.h |  1 -
 lld/lib/ReaderWriter/ELF/TODO.txt        |  2 --
 lld/lib/ReaderWriter/ELF/TargetLayout.h  |  4 ++--
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lld/lib/ReaderWriter/ELF/DefaultLayout.h b/lld/lib/ReaderWriter/ELF/DefaultLayout.h
index 18a60577a376..f1c00a66c3f2 100644
--- a/lld/lib/ReaderWriter/ELF/DefaultLayout.h
+++ b/lld/lib/ReaderWriter/ELF/DefaultLayout.h
@@ -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) {
diff --git a/lld/lib/ReaderWriter/ELF/SegmentChunks.h b/lld/lib/ReaderWriter/ELF/SegmentChunks.h
index cdee646e904b..6b611f0baeca 100644
--- a/lld/lib/ReaderWriter/ELF/SegmentChunks.h
+++ b/lld/lib/ReaderWriter/ELF/SegmentChunks.h
@@ -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
diff --git a/lld/lib/ReaderWriter/ELF/TODO.txt b/lld/lib/ReaderWriter/ELF/TODO.txt
index 5723458abf1e..7047692da06b 100644
--- a/lld/lib/ReaderWriter/ELF/TODO.txt
+++ b/lld/lib/ReaderWriter/ELF/TODO.txt
@@ -16,6 +16,4 @@ lib/ReaderWriter/ELF
 
 - Gnu linkonce sections.
 
-- ScriptLayout
-
 - Fix section flags as they appear in input (update content permissions)
diff --git a/lld/lib/ReaderWriter/ELF/TargetLayout.h b/lld/lib/ReaderWriter/ELF/TargetLayout.h
index 58cac1cd843b..132979834590 100644
--- a/lld/lib/ReaderWriter/ELF/TargetLayout.h
+++ b/lld/lib/ReaderWriter/ELF/TargetLayout.h
@@ -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