ELF: Remove empty classes.

llvm-svn: 233880

8 files changed, 16 insertions, 27 deletions

diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
index 5cc58cb638c..f945e3e208a 100644
--- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
+++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
@@ -20,7 +20,7 @@ template <class ELFT>
 class AArch64DynamicLibraryWriter : public DynamicLibraryWriter<ELFT> {
 public:
   AArch64DynamicLibraryWriter(AArch64LinkingContext &ctx,
-                              AArch64TargetLayout<ELFT> &layout);
+                              TargetLayout<ELFT> &layout);
 
 protected:
   // Add any runtime files and their atoms to the output
@@ -43,12 +43,12 @@ private:
 
   std::unique_ptr<GOTFile> _gotFile;
   AArch64LinkingContext &_ctx;
-  AArch64TargetLayout<ELFT> &_layout;
+  TargetLayout<ELFT> &_layout;
 };
 
 template <class ELFT>
 AArch64DynamicLibraryWriter<ELFT>::AArch64DynamicLibraryWriter(
-    AArch64LinkingContext &ctx, AArch64TargetLayout<ELFT> &layout)
+    AArch64LinkingContext &ctx, TargetLayout<ELFT> &layout)
     : DynamicLibraryWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
       _ctx(ctx), _layout(layout) {}
 
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
index f1ede979ce6..297de0026df 100644
--- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
+++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
@@ -19,7 +19,7 @@ template <class ELFT>
 class AArch64ExecutableWriter : public ExecutableWriter<ELFT> {
 public:
   AArch64ExecutableWriter(AArch64LinkingContext &ctx,
-                          AArch64TargetLayout<ELFT> &layout);
+                          TargetLayout<ELFT> &layout);
 
 protected:
   // Add any runtime files and their atoms to the output
@@ -42,12 +42,12 @@ private:
 
   std::unique_ptr<GOTFile> _gotFile;
   AArch64LinkingContext &_ctx;
-  AArch64TargetLayout<ELFT> &_layout;
+  TargetLayout<ELFT> &_layout;
 };
 
 template <class ELFT>
 AArch64ExecutableWriter<ELFT>::AArch64ExecutableWriter(
-    AArch64LinkingContext &ctx, AArch64TargetLayout<ELFT> &layout)
+    AArch64LinkingContext &ctx, TargetLayout<ELFT> &layout)
     : ExecutableWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
       _ctx(ctx), _layout(layout) {}
 
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
index c755cc19334..c1e88aa210d 100644
--- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
@@ -17,7 +17,7 @@ using namespace lld;
 using namespace elf;
 
 AArch64TargetHandler::AArch64TargetHandler(AArch64LinkingContext &ctx)
-    : _ctx(ctx), _targetLayout(new AArch64TargetLayout<AArch64ELFType>(ctx)),
+    : _ctx(ctx), _targetLayout(new TargetLayout<AArch64ELFType>(ctx)),
       _relocationHandler(new AArch64TargetRelocationHandler()) {}
 
 static const Registry::KindStrings kindStrings[] = {
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
index e57f9a43baf..ad8be3cdc16 100644
--- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
@@ -20,11 +20,6 @@ namespace lld {
 namespace elf {
 class AArch64LinkingContext;
 
-template <class ELFT> class AArch64TargetLayout : public TargetLayout<ELFT> {
-public:
-  AArch64TargetLayout(AArch64LinkingContext &ctx) : TargetLayout<ELFT>(ctx) {}
-};
-
 class AArch64TargetHandler final : public TargetHandler {
 public:
   AArch64TargetHandler(AArch64LinkingContext &ctx);
@@ -47,7 +42,7 @@ public:
 
 private:
   AArch64LinkingContext &_ctx;
-  std::unique_ptr<AArch64TargetLayout<AArch64ELFType>> _targetLayout;
+  std::unique_ptr<TargetLayout<AArch64ELFType>> _targetLayout;
   std::unique_ptr<AArch64TargetRelocationHandler> _relocationHandler;
 };
 
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h
index 94f99d0232e..9e1c9d4fcdd 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h
@@ -18,8 +18,7 @@ namespace elf {
 template <class ELFT>
 class X86DynamicLibraryWriter : public DynamicLibraryWriter<ELFT> {
 public:
-  X86DynamicLibraryWriter(X86LinkingContext &ctx,
-                          X86TargetLayout<ELFT> &layout);
+  X86DynamicLibraryWriter(X86LinkingContext &ctx, TargetLayout<ELFT> &layout);
 
 protected:
   // Add any runtime files and their atoms to the output
@@ -42,12 +41,12 @@ private:
 
   std::unique_ptr<GOTFile> _gotFile;
   X86LinkingContext &_ctx;
-  X86TargetLayout<ELFT> &_layout;
+  TargetLayout<ELFT> &_layout;
 };
 
 template <class ELFT>
 X86DynamicLibraryWriter<ELFT>::X86DynamicLibraryWriter(
-    X86LinkingContext &ctx, X86TargetLayout<ELFT> &layout)
+    X86LinkingContext &ctx, TargetLayout<ELFT> &layout)
     : DynamicLibraryWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
       _ctx(ctx), _layout(layout) {}
 
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h b/lld/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h
index a1d723caa0b..1f657fc8383 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h
@@ -18,7 +18,7 @@ namespace elf {
 template <class ELFT>
 class X86ExecutableWriter : public ExecutableWriter<ELFT> {
 public:
-  X86ExecutableWriter(X86LinkingContext &ctx, X86TargetLayout<ELFT> &layout);
+  X86ExecutableWriter(X86LinkingContext &ctx, TargetLayout<ELFT> &layout);
 
 protected:
   // Add any runtime files and their atoms to the output
@@ -34,12 +34,12 @@ protected:
 
 private:
   X86LinkingContext &_ctx;
-  X86TargetLayout<ELFT> &_layout;
+  TargetLayout<ELFT> &_layout;
 };
 
 template <class ELFT>
 X86ExecutableWriter<ELFT>::X86ExecutableWriter(X86LinkingContext &ctx,
-                                               X86TargetLayout<ELFT> &layout)
+                                               TargetLayout<ELFT> &layout)
     : ExecutableWriter<ELFT>(ctx, layout), _ctx(ctx), _layout(layout) {}
 
 template <class ELFT>
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
index 621b32f396b..18cbb61f1fe 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
@@ -46,5 +46,5 @@ void X86TargetHandler::registerRelocationNames(Registry &registry) {
 }
 
 X86TargetHandler::X86TargetHandler(X86LinkingContext &ctx)
-    : _ctx(ctx), _targetLayout(new X86TargetLayout<X86ELFType>(ctx)),
+    : _ctx(ctx), _targetLayout(new TargetLayout<X86ELFType>(ctx)),
       _relocationHandler(new X86TargetRelocationHandler()) {}
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
index 96b3829a099..4291f695174 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
@@ -20,11 +20,6 @@ namespace elf {
 
 class X86LinkingContext;
 
-template <class ELFT> class X86TargetLayout : public TargetLayout<ELFT> {
-public:
-  X86TargetLayout(X86LinkingContext &ctx) : TargetLayout<ELFT>(ctx) {}
-};
-
 class X86TargetHandler final : public TargetHandler {
 public:
   X86TargetHandler(X86LinkingContext &ctx);
@@ -47,7 +42,7 @@ public:
 
 protected:
   X86LinkingContext &_ctx;
-  std::unique_ptr<X86TargetLayout<X86ELFType>> _targetLayout;
+  std::unique_ptr<TargetLayout<X86ELFType>> _targetLayout;
   std::unique_ptr<X86TargetRelocationHandler> _relocationHandler;
 };
 } // end namespace elf