Rename _AArch64TargetLayout.
authorRui Ueyama <ruiu@google.com>
Tue, 31 Mar 2015 19:35:35 +0000 (19:35 +0000)
committerRui Ueyama <ruiu@google.com>
Tue, 31 Mar 2015 19:35:35 +0000 (19:35 +0000)
This change should have been done in r233737, but I made a mistake to
not include into that.

llvm-svn: 233738

lld/lib/ReaderWriter/ELF/AArch64/AArch64DynamicLibraryWriter.h
lld/lib/ReaderWriter/ELF/AArch64/AArch64ExecutableWriter.h
lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.cpp
lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h

index 83eab7d641173fbf5f25b107fbbf5b17806a2abc..355b26cc8830e6fee994846d42a27589797f49a8 100644 (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(
index f8e85b2c5999c3f0167256741e7cf625914fe27c..520f192621772a0dafd86d47dccf2ccb95ee5968 100644 (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(
index a68a1f3ca413498f23c6ca9837c13d4315ed3b7e..bc7b8744fa226993578e25bfedbba679dca9dd4f 100644 (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:
index 901e315ee6902cb1a753f08d08b0d110be59e691..cc28f7bc64c7aa102223c281319db5023593373e 100644 (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