diff options
author | Stephen Hines <srhines@google.com> | 2014-11-26 18:48:20 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2014-11-26 18:49:58 -0800 |
commit | 37b74a387bb3993387029859c2d9d051c41c724e (patch) | |
tree | a2a5b611b47a82624fe31dc457d12533a3aaaed6 /lib/Target/AArch64/AArch64GOT.h | |
parent | dfd6c08c66b4b3d58fd28b5376478381e1a5647a (diff) | |
download | mclinker-37b74a387bb3993387029859c2d9d051c41c724e.tar.gz |
Update mclinker for LLVM rebase to r222494.
This corresponds to the following upstream mclinker change:
commit b2f1691276052c4215abf36715d43248d6337cf8
Author: Diana Chen <mysekki@gmail.com>
Date: Tue Nov 25 14:03:29 2014 +0800
option: Allow `-hash-style' can be specified zero or more times
Change-Id: I332546680bb45cf9692adfa2c2d3dcdc84361afc
Diffstat (limited to 'lib/Target/AArch64/AArch64GOT.h')
-rw-r--r-- | lib/Target/AArch64/AArch64GOT.h | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/lib/Target/AArch64/AArch64GOT.h b/lib/Target/AArch64/AArch64GOT.h index 0e46e9e..f790e8b 100644 --- a/lib/Target/AArch64/AArch64GOT.h +++ b/lib/Target/AArch64/AArch64GOT.h @@ -6,11 +6,11 @@ // License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// -#ifndef TARGET_AARCH64_AARCH64GOT_H -#define TARGET_AARCH64_AARCH64GOT_H +#ifndef TARGET_AARCH64_AARCH64GOT_H_ +#define TARGET_AARCH64_AARCH64GOT_H_ -#include <mcld/Support/MemoryRegion.h> -#include <mcld/Target/GOT.h> +#include "mcld/Support/MemoryRegion.h" +#include "mcld/Target/GOT.h" #include <llvm/ADT/DenseMap.h> @@ -23,12 +23,10 @@ class LDSection; /** \class AArch64GOTEntry * \brief GOT Entry with size of 8 bytes */ -class AArch64GOTEntry : public GOT::Entry<8> -{ -public: +class AArch64GOTEntry : public GOT::Entry<8> { + public: AArch64GOTEntry(uint64_t pContent, SectionData* pParent) - : GOT::Entry<8>(pContent, pParent) - {} + : GOT::Entry<8>(pContent, pParent) {} }; /** \class AArch64GOT @@ -53,10 +51,9 @@ public: * +--------------+ * */ -class AArch64GOT : public GOT -{ -public: - AArch64GOT(LDSection &pSection); +class AArch64GOT : public GOT { + public: + explicit AArch64GOT(LDSection& pSection); ~AArch64GOT(); @@ -78,12 +75,12 @@ public: bool hasGOT1() const; -private: + private: typedef std::vector<AArch64GOTEntry*> EntryListType; typedef EntryListType::iterator entry_iterator; typedef EntryListType::const_iterator const_entry_iterator; -private: + private: AArch64GOTEntry* m_pGOTPLTFront; AArch64GOTEntry* m_pGOTFront; @@ -94,7 +91,6 @@ private: EntryListType m_GOT; }; -} // namespace of mcld - -#endif +} // namespace mcld +#endif // TARGET_AARCH64_AARCH64GOT_H_ |