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
diff --git a/include/mcld/LD/SectionData.h b/include/mcld/LD/SectionData.h
index ddafaf1..22cda34 100644
--- a/include/mcld/LD/SectionData.h
+++ b/include/mcld/LD/SectionData.h
@@ -6,17 +6,18 @@
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
-#ifndef MCLD_LD_SECTIONDATA_H
-#define MCLD_LD_SECTIONDATA_H
+#ifndef MCLD_LD_SECTIONDATA_H_
+#define MCLD_LD_SECTIONDATA_H_
+
+#include "mcld/Config/Config.h"
+#include "mcld/Fragment/Fragment.h"
+#include "mcld/Support/Allocators.h"
+#include "mcld/Support/Compiler.h"
#include <llvm/ADT/ilist.h>
#include <llvm/ADT/ilist_node.h>
#include <llvm/Support/DataTypes.h>
-#include <mcld/Config/Config.h>
-#include <mcld/Support/Allocators.h>
-#include <mcld/Fragment/Fragment.h>
-
namespace mcld {
class LDSection;
@@ -24,18 +25,14 @@
/** \class SectionData
* \brief SectionData provides a container for all Fragments.
*/
-class SectionData
-{
-private:
+class SectionData {
+ private:
friend class Chunk<SectionData, MCLD_SECTIONS_PER_INPUT>;
SectionData();
- explicit SectionData(LDSection &pSection);
+ explicit SectionData(LDSection& pSection);
- SectionData(const SectionData &); // DO NOT IMPLEMENT
- SectionData& operator=(const SectionData &); // DO NOT IMPLEMENT
-
-public:
+ public:
typedef llvm::iplist<Fragment> FragmentListType;
typedef FragmentListType::reference reference;
@@ -47,7 +44,7 @@
typedef FragmentListType::reverse_iterator reverse_iterator;
typedef FragmentListType::const_reverse_iterator const_reverse_iterator;
-public:
+ public:
static SectionData* Create(LDSection& pSection);
static void Destroy(SectionData*& pSection);
@@ -55,36 +52,37 @@
static void Clear();
const LDSection& getSection() const { return *m_pSection; }
- LDSection& getSection() { return *m_pSection; }
+ LDSection& getSection() { return *m_pSection; }
- FragmentListType &getFragmentList() { return m_Fragments; }
- const FragmentListType &getFragmentList() const { return m_Fragments; }
+ const FragmentListType& getFragmentList() const { return m_Fragments; }
+ FragmentListType& getFragmentList() { return m_Fragments; }
size_t size() const { return m_Fragments.size(); }
bool empty() const { return m_Fragments.empty(); }
- reference front () { return m_Fragments.front(); }
- const_reference front () const { return m_Fragments.front(); }
- reference back () { return m_Fragments.back(); }
- const_reference back () const { return m_Fragments.back(); }
+ reference front() { return m_Fragments.front(); }
+ const_reference front() const { return m_Fragments.front(); }
+ reference back() { return m_Fragments.back(); }
+ const_reference back() const { return m_Fragments.back(); }
- const_iterator begin () const { return m_Fragments.begin(); }
- iterator begin () { return m_Fragments.begin(); }
- const_iterator end () const { return m_Fragments.end(); }
- iterator end () { return m_Fragments.end(); }
+ const_iterator begin() const { return m_Fragments.begin(); }
+ iterator begin() { return m_Fragments.begin(); }
+ const_iterator end() const { return m_Fragments.end(); }
+ iterator end() { return m_Fragments.end(); }
const_reverse_iterator rbegin() const { return m_Fragments.rbegin(); }
- reverse_iterator rbegin() { return m_Fragments.rbegin(); }
- const_reverse_iterator rend () const { return m_Fragments.rend(); }
- reverse_iterator rend () { return m_Fragments.rend(); }
+ reverse_iterator rbegin() { return m_Fragments.rbegin(); }
+ const_reverse_iterator rend() const { return m_Fragments.rend(); }
+ reverse_iterator rend() { return m_Fragments.rend(); }
-private:
+ private:
FragmentListType m_Fragments;
LDSection* m_pSection;
+ private:
+ DISALLOW_COPY_AND_ASSIGN(SectionData);
};
-} // namespace of mcld
+} // namespace mcld
-#endif
-
+#endif // MCLD_LD_SECTIONDATA_H_