replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _AArch64TargetLayout. 

This change should have been done in r233737, but I made a mistake to
not include into that.

llvm-svn: 233738
This commit is contained in:
Rui Ueyama 2015-03-31 19:35:35 +00:00
parent efaf6a77d1
commit 1f0cd04df9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
View File

@ -43,14 +43,14 @@ private:
std::unique_ptr<GOTFile> _gotFile;
AArch64LinkingContext &_ctx;
AArch64TargetLayout<ELFT> &_AArch64Layout;
AArch64TargetLayout<ELFT> &_aarch64Layout;
};
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), _aarch64Layout(layout) {}
template <class ELFT>
bool AArch64DynamicLibraryWriter<ELFT>::createImplicitFiles(

4
lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
View File

@ -42,14 +42,14 @@ private:
std::unique_ptr<GOTFile> _gotFile;
AArch64LinkingContext &_ctx;
AArch64TargetLayout<ELFT> &_AArch64Layout;
AArch64TargetLayout<ELFT> &_aarch64Layout;
};
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), _aarch64Layout(layout) {}
template <class ELFT>
bool AArch64ExecutableWriter<ELFT>::createImplicitFiles(

8
lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
View File

@ -18,8 +18,8 @@ using namespace elf;
AArch64TargetHandler::AArch64TargetHandler(AArch64LinkingContext &ctx)
: _ctx(ctx),
_AArch64TargetLayout(new AArch64TargetLayout<AArch64ELFType>(ctx)),
_AArch64RelocationHandler(new AArch64TargetRelocationHandler()) {}
_aarch64TargetLayout(new AArch64TargetLayout<AArch64ELFType>(ctx)),
_aarch64RelocationHandler(new AArch64TargetRelocationHandler()) {}
void AArch64TargetHandler::registerRelocationNames(Registry &registry) {
registry.addKindTable(Reference::KindNamespace::ELF,
@ -30,10 +30,10 @@ std::unique_ptr<Writer> AArch64TargetHandler::getWriter() {
switch (this->_ctx.getOutputELFType()) {
case llvm::ELF::ET_EXEC:
return llvm::make_unique<AArch64ExecutableWriter<AArch64ELFType>>(
_ctx, *_AArch64TargetLayout.get());
_ctx, *_aarch64TargetLayout.get());
case llvm::ELF::ET_DYN:
return llvm::make_unique<AArch64DynamicLibraryWriter<AArch64ELFType>>(
_ctx, *_AArch64TargetLayout.get());
_ctx, *_aarch64TargetLayout.get());
case llvm::ELF::ET_REL:
llvm_unreachable("TODO: support -r mode");
default:

8
lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
View File

@ -31,13 +31,13 @@ public:
AArch64TargetHandler(AArch64LinkingContext &ctx);
AArch64TargetLayout<AArch64ELFType> &getTargetLayout() override {
return *(_AArch64TargetLayout.get());
return *(_aarch64TargetLayout.get());
}
void registerRelocationNames(Registry &registry) override;
const AArch64TargetRelocationHandler &getRelocationHandler() const override {
return *(_AArch64RelocationHandler.get());
return *(_aarch64RelocationHandler.get());
}
std::unique_ptr<Reader> getObjReader() override {
@ -53,8 +53,8 @@ public:
private:
static const Registry::KindStrings kindStrings[];
AArch64LinkingContext &_ctx;
std::unique_ptr<AArch64TargetLayout<AArch64ELFType>> _AArch64TargetLayout;
std::unique_ptr<AArch64TargetRelocationHandler> _AArch64RelocationHandler;
std::unique_ptr<AArch64TargetLayout<AArch64ELFType>> _aarch64TargetLayout;
std::unique_ptr<AArch64TargetRelocationHandler> _aarch64RelocationHandler;
};
} // end namespace elf