[lld] r233880 - ELF: Remove empty classes.
Rui Ueyama
ruiu at google.com
Wed Apr 1 18:22:23 PDT 2015
Author: ruiu
Date: Wed Apr 1 20:22:23 2015
New Revision: 233880
URL: http://llvm.org/viewvc/llvm-project?rev=233880&view=rev
Log:
ELF: Remove empty classes.
Modified:
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h
lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h
lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h Wed Apr 1 20:22:23 2015
@@ -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) {}
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h Wed Apr 1 20:22:23 2015
@@ -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) {}
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp Wed Apr 1 20:22:23 2015
@@ -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[] = {
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h Wed Apr 1 20:22:23 2015
@@ -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;
};
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h Wed Apr 1 20:22:23 2015
@@ -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) {}
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h Wed Apr 1 20:22:23 2015
@@ -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>
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp Wed Apr 1 20:22:23 2015
@@ -46,5 +46,5 @@ void X86TargetHandler::registerRelocatio
}
X86TargetHandler::X86TargetHandler(X86LinkingContext &ctx)
- : _ctx(ctx), _targetLayout(new X86TargetLayout<X86ELFType>(ctx)),
+ : _ctx(ctx), _targetLayout(new TargetLayout<X86ELFType>(ctx)),
_relocationHandler(new X86TargetRelocationHandler()) {}
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h?rev=233880&r1=233879&r2=233880&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h Wed Apr 1 20:22:23 2015
@@ -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
More information about the llvm-commits
mailing list