[lld] r233873 - ELF: x86, x86-64, ARM, AArch64: Remove architecture name prefixes from class members.
Rui Ueyama
ruiu at google.com
Wed Apr 1 17:19:04 PDT 2015
Author: ruiu
Date: Wed Apr 1 19:19:04 2015
New Revision: 233873
URL: http://llvm.org/viewvc/llvm-project?rev=233873&view=rev
Log:
ELF: x86, x86-64, ARM, AArch64: Remove architecture name prefixes from class members.
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/ARM/ARMTargetHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
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
lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.cpp
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h Wed Apr 1 19:19:04 2015
@@ -43,14 +43,14 @@ private:
std::unique_ptr<GOTFile> _gotFile;
AArch64LinkingContext &_ctx;
- AArch64TargetLayout<ELFT> &_aarch64Layout;
+ AArch64TargetLayout<ELFT> &_layout;
};
template <class ELFT>
AArch64DynamicLibraryWriter<ELFT>::AArch64DynamicLibraryWriter(
AArch64LinkingContext &ctx, AArch64TargetLayout<ELFT> &layout)
: DynamicLibraryWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
- _ctx(ctx), _aarch64Layout(layout) {}
+ _ctx(ctx), _layout(layout) {}
template <class ELFT>
bool AArch64DynamicLibraryWriter<ELFT>::createImplicitFiles(
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h Wed Apr 1 19:19:04 2015
@@ -42,14 +42,14 @@ private:
std::unique_ptr<GOTFile> _gotFile;
AArch64LinkingContext &_ctx;
- AArch64TargetLayout<ELFT> &_aarch64Layout;
+ AArch64TargetLayout<ELFT> &_layout;
};
template <class ELFT>
AArch64ExecutableWriter<ELFT>::AArch64ExecutableWriter(
AArch64LinkingContext &ctx, AArch64TargetLayout<ELFT> &layout)
: ExecutableWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
- _ctx(ctx), _aarch64Layout(layout) {}
+ _ctx(ctx), _layout(layout) {}
template <class ELFT>
bool AArch64ExecutableWriter<ELFT>::createImplicitFiles(
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -17,9 +17,8 @@ using namespace lld;
using namespace elf;
AArch64TargetHandler::AArch64TargetHandler(AArch64LinkingContext &ctx)
- : _ctx(ctx),
- _aarch64TargetLayout(new AArch64TargetLayout<AArch64ELFType>(ctx)),
- _aarch64RelocationHandler(new AArch64TargetRelocationHandler()) {}
+ : _ctx(ctx), _targetLayout(new AArch64TargetLayout<AArch64ELFType>(ctx)),
+ _relocationHandler(new AArch64TargetRelocationHandler()) {}
static const Registry::KindStrings kindStrings[] = {
#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
@@ -37,10 +36,10 @@ std::unique_ptr<Writer> AArch64TargetHan
switch (this->_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
return llvm::make_unique<AArch64ExecutableWriter<AArch64ELFType>>(
- _ctx, *_aarch64TargetLayout.get());
+ _ctx, *_targetLayout);
case llvm::ELF::ET_DYN:
return llvm::make_unique<AArch64DynamicLibraryWriter<AArch64ELFType>>(
- _ctx, *_aarch64TargetLayout.get());
+ _ctx, *_targetLayout);
case llvm::ELF::ET_REL:
llvm_unreachable("TODO: support -r mode");
default:
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h Wed Apr 1 19:19:04 2015
@@ -32,7 +32,7 @@ public:
void registerRelocationNames(Registry ®istry) override;
const AArch64TargetRelocationHandler &getRelocationHandler() const override {
- return *_aarch64RelocationHandler;
+ return *_relocationHandler;
}
std::unique_ptr<Reader> getObjReader() override {
@@ -47,8 +47,8 @@ public:
private:
AArch64LinkingContext &_ctx;
- std::unique_ptr<AArch64TargetLayout<AArch64ELFType>> _aarch64TargetLayout;
- std::unique_ptr<AArch64TargetRelocationHandler> _aarch64RelocationHandler;
+ std::unique_ptr<AArch64TargetLayout<AArch64ELFType>> _targetLayout;
+ std::unique_ptr<AArch64TargetRelocationHandler> _relocationHandler;
};
} // end namespace elf
Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -16,9 +16,8 @@ using namespace lld;
using namespace elf;
ARMTargetHandler::ARMTargetHandler(ARMLinkingContext &ctx)
- : _ctx(ctx), _armTargetLayout(new ARMTargetLayout<ARMELFType>(ctx)),
- _armRelocationHandler(
- new ARMTargetRelocationHandler(*_armTargetLayout.get())) {}
+ : _ctx(ctx), _targetLayout(new ARMTargetLayout<ARMELFType>(ctx)),
+ _relocationHandler(new ARMTargetRelocationHandler(*_targetLayout)) {}
static const Registry::KindStrings kindStrings[] = {
#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
@@ -35,8 +34,8 @@ void ARMTargetHandler::registerRelocatio
std::unique_ptr<Writer> ARMTargetHandler::getWriter() {
switch (this->_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
- return llvm::make_unique<ARMExecutableWriter<ARMELFType>>(
- _ctx, *_armTargetLayout.get());
+ return llvm::make_unique<ARMExecutableWriter<ARMELFType>>(_ctx,
+ *_targetLayout);
default:
llvm_unreachable("unsupported output type");
}
Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h Wed Apr 1 19:19:04 2015
@@ -64,7 +64,7 @@ public:
void registerRelocationNames(Registry ®istry) override;
const ARMTargetRelocationHandler &getRelocationHandler() const override {
- return *_armRelocationHandler;
+ return *_relocationHandler;
}
std::unique_ptr<Reader> getObjReader() override {
@@ -79,8 +79,8 @@ public:
private:
ARMLinkingContext &_ctx;
- std::unique_ptr<ARMTargetLayout<ARMELFType>> _armTargetLayout;
- std::unique_ptr<ARMTargetRelocationHandler> _armRelocationHandler;
+ std::unique_ptr<ARMTargetLayout<ARMELFType>> _targetLayout;
+ std::unique_ptr<ARMTargetRelocationHandler> _relocationHandler;
};
} // end namespace elf
Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -27,10 +27,10 @@ std::unique_ptr<Writer> HexagonTargetHan
switch (_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
return llvm::make_unique<HexagonExecutableWriter<HexagonELFType>>(
- _ctx, *_targetLayout.get());
+ _ctx, *_targetLayout);
case llvm::ELF::ET_DYN:
return llvm::make_unique<HexagonDynamicLibraryWriter<HexagonELFType>>(
- _ctx, *_targetLayout.get());
+ _ctx, *_targetLayout);
case llvm::ELF::ET_REL:
llvm_unreachable("TODO: support -r mode");
default:
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86DynamicLibraryWriter.h Wed Apr 1 19:19:04 2015
@@ -42,14 +42,14 @@ private:
std::unique_ptr<GOTFile> _gotFile;
X86LinkingContext &_ctx;
- X86TargetLayout<ELFT> &_x86Layout;
+ X86TargetLayout<ELFT> &_layout;
};
template <class ELFT>
X86DynamicLibraryWriter<ELFT>::X86DynamicLibraryWriter(
X86LinkingContext &ctx, X86TargetLayout<ELFT> &layout)
: DynamicLibraryWriter<ELFT>(ctx, layout), _gotFile(new GOTFile(ctx)),
- _ctx(ctx), _x86Layout(layout) {}
+ _ctx(ctx), _layout(layout) {}
template <class ELFT>
bool X86DynamicLibraryWriter<ELFT>::createImplicitFiles(
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86ExecutableWriter.h Wed Apr 1 19:19:04 2015
@@ -34,13 +34,13 @@ protected:
private:
X86LinkingContext &_ctx;
- X86TargetLayout<ELFT> &_x86Layout;
+ X86TargetLayout<ELFT> &_layout;
};
template <class ELFT>
X86ExecutableWriter<ELFT>::X86ExecutableWriter(X86LinkingContext &ctx,
X86TargetLayout<ELFT> &layout)
- : ExecutableWriter<ELFT>(ctx, layout), _ctx(ctx), _x86Layout(layout) {}
+ : ExecutableWriter<ELFT>(ctx, layout), _ctx(ctx), _layout(layout) {}
template <class ELFT>
bool X86ExecutableWriter<ELFT>::createImplicitFiles(
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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -21,11 +21,11 @@ using namespace llvm::ELF;
std::unique_ptr<Writer> X86TargetHandler::getWriter() {
switch (_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
- return llvm::make_unique<X86ExecutableWriter<X86ELFType>>(
- _ctx, *_x86TargetLayout.get());
+ return llvm::make_unique<X86ExecutableWriter<X86ELFType>>(_ctx,
+ *_targetLayout);
case llvm::ELF::ET_DYN:
return llvm::make_unique<X86DynamicLibraryWriter<X86ELFType>>(
- _ctx, *_x86TargetLayout.get());
+ _ctx, *_targetLayout);
case llvm::ELF::ET_REL:
llvm_unreachable("TODO: support -r mode");
default:
@@ -46,5 +46,5 @@ void X86TargetHandler::registerRelocatio
}
X86TargetHandler::X86TargetHandler(X86LinkingContext &ctx)
- : _ctx(ctx), _x86TargetLayout(new X86TargetLayout<X86ELFType>(ctx)),
- _x86RelocationHandler(new X86TargetRelocationHandler()) {}
+ : _ctx(ctx), _targetLayout(new X86TargetLayout<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=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86TargetHandler.h Wed Apr 1 19:19:04 2015
@@ -32,7 +32,7 @@ public:
void registerRelocationNames(Registry ®istry) override;
const X86TargetRelocationHandler &getRelocationHandler() const override {
- return *_x86RelocationHandler;
+ return *_relocationHandler;
}
std::unique_ptr<Reader> getObjReader() override {
@@ -47,8 +47,8 @@ public:
protected:
X86LinkingContext &_ctx;
- std::unique_ptr<X86TargetLayout<X86ELFType>> _x86TargetLayout;
- std::unique_ptr<X86TargetRelocationHandler> _x86RelocationHandler;
+ std::unique_ptr<X86TargetLayout<X86ELFType>> _targetLayout;
+ std::unique_ptr<X86TargetRelocationHandler> _relocationHandler;
};
} // end namespace elf
} // end namespace lld
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -15,9 +15,8 @@ using namespace lld;
using namespace elf;
ExampleTargetHandler::ExampleTargetHandler(ExampleLinkingContext &c)
- : X86_64TargetHandler(c), _exampleContext(c) {}
+ : X86_64TargetHandler(c), _ctx(c) {}
std::unique_ptr<Writer> ExampleTargetHandler::getWriter() {
- return std::unique_ptr<Writer>(
- new X86_64ExecutableWriter(_exampleContext, *_x86_64TargetLayout));
+ return llvm::make_unique<X86_64ExecutableWriter>(_ctx, *_targetLayout);
}
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h Wed Apr 1 19:19:04 2015
@@ -23,7 +23,7 @@ public:
std::unique_ptr<Writer> getWriter() override;
private:
- ExampleLinkingContext &_exampleContext;
+ ExampleLinkingContext &_ctx;
};
} // end namespace elf
} // end namespace lld
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp Wed Apr 1 19:19:04 2015
@@ -97,7 +97,7 @@ std::error_code X86_64TargetRelocationHa
case R_X86_64_TPOFF64:
case R_X86_64_DTPOFF32:
case R_X86_64_TPOFF32: {
- _tlsSize = _x86_64Layout.getTLSSize();
+ _tlsSize = _layout.getTLSSize();
if (ref.kindValue() == R_X86_64_TPOFF32 ||
ref.kindValue() == R_X86_64_DTPOFF32) {
write32le(location, targetVAddress - _tlsSize);
@@ -126,8 +126,7 @@ std::error_code X86_64TargetRelocationHa
for (const Reference *r : *target) {
if (r->kindValue() == R_X86_64_JUMP_SLOT) {
uint32_t index;
- if (!_x86_64Layout.getPLTRelocationTable()->getRelocationIndex(*r,
- index))
+ if (!_layout.getPLTRelocationTable()->getRelocationIndex(*r, index))
llvm_unreachable("Relocation doesn't exist");
reloc32(location, 0, index, 0);
break;
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h Wed Apr 1 19:19:04 2015
@@ -21,7 +21,7 @@ class X86_64TargetLayout;
class X86_64TargetRelocationHandler final : public TargetRelocationHandler {
public:
X86_64TargetRelocationHandler(X86_64TargetLayout &layout)
- : _tlsSize(0), _x86_64Layout(layout) {}
+ : _tlsSize(0), _layout(layout) {}
std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
const lld::AtomLayout &,
@@ -30,7 +30,7 @@ public:
private:
// Cached size of the TLS segment.
mutable uint64_t _tlsSize;
- X86_64TargetLayout &_x86_64Layout;
+ X86_64TargetLayout &_layout;
};
} // end namespace elf
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.cpp?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.cpp Wed Apr 1 19:19:04 2015
@@ -17,9 +17,8 @@ using namespace lld;
using namespace elf;
X86_64TargetHandler::X86_64TargetHandler(X86_64LinkingContext &ctx)
- : _ctx(ctx), _x86_64TargetLayout(new X86_64TargetLayout(ctx)),
- _x86_64RelocationHandler(
- new X86_64TargetRelocationHandler(*_x86_64TargetLayout.get())) {}
+ : _ctx(ctx), _targetLayout(new X86_64TargetLayout(ctx)),
+ _relocationHandler(new X86_64TargetRelocationHandler(*_targetLayout)) {}
static const Registry::KindStrings kindStrings[] = {
#define ELF_RELOC(name, value) LLD_KIND_STRING_ENTRY(name),
@@ -37,11 +36,9 @@ void X86_64TargetHandler::registerReloca
std::unique_ptr<Writer> X86_64TargetHandler::getWriter() {
switch (this->_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
- return llvm::make_unique<X86_64ExecutableWriter>(
- _ctx, *_x86_64TargetLayout.get());
+ return llvm::make_unique<X86_64ExecutableWriter>(_ctx, *_targetLayout);
case llvm::ELF::ET_DYN:
- return llvm::make_unique<X86_64DynamicLibraryWriter>(
- _ctx, *_x86_64TargetLayout.get());
+ return llvm::make_unique<X86_64DynamicLibraryWriter>(_ctx, *_targetLayout);
case llvm::ELF::ET_REL:
llvm_unreachable("TODO: support -r mode");
default:
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h?rev=233873&r1=233872&r2=233873&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h Wed Apr 1 19:19:04 2015
@@ -36,7 +36,7 @@ public:
void registerRelocationNames(Registry ®istry) override;
const X86_64TargetRelocationHandler &getRelocationHandler() const override {
- return *_x86_64RelocationHandler;
+ return *_relocationHandler;
}
std::unique_ptr<Reader> getObjReader() override {
@@ -51,8 +51,8 @@ public:
protected:
X86_64LinkingContext &_ctx;
- std::unique_ptr<X86_64TargetLayout> _x86_64TargetLayout;
- std::unique_ptr<X86_64TargetRelocationHandler> _x86_64RelocationHandler;
+ std::unique_ptr<X86_64TargetLayout> _targetLayout;
+ std::unique_ptr<X86_64TargetRelocationHandler> _relocationHandler;
};
} // end namespace elf
More information about the llvm-commits
mailing list