summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2016-03-08 01:14:55 -0800
committerStephen Hines <srhines@google.com>2016-03-08 01:16:18 -0800
commit07177ff8032d136567f3e99d372cb67713f1bba8 (patch)
treea7befed71dbf26f45a068ee673db6d79e8b3e404
parentb0d0eb206527b43c771933602e147bbd7b471082 (diff)
downloadmclinker-07177ff8032d136567f3e99d372cb67713f1bba8.tar.gz
Fix up mclinker so that it builds/runs for LLVM rebase to r256229.
Bug: http://b/26987366 Change-Id: I5e833126df84c86503fe6343256d33c8231e8327
-rw-r--r--include/mcld/Fragment/Fragment.h2
-rw-r--r--include/mcld/LD/SectionData.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/mcld/Fragment/Fragment.h b/include/mcld/Fragment/Fragment.h
index 76a5028..3e84811 100644
--- a/include/mcld/Fragment/Fragment.h
+++ b/include/mcld/Fragment/Fragment.h
@@ -24,7 +24,7 @@ class SectionData;
/** \class Fragment
* \brief Fragment is the minimun linking unit of MCLinker.
*/
-class Fragment : public llvm::ilist_node<Fragment> {
+class Fragment : public llvm::ilist_node_with_parent<Fragment, SectionData> {
public:
enum Type { Alignment, Fillment, Region, Target, Stub, Null };
diff --git a/include/mcld/LD/SectionData.h b/include/mcld/LD/SectionData.h
index 22cda34..82027c2 100644
--- a/include/mcld/LD/SectionData.h
+++ b/include/mcld/LD/SectionData.h
@@ -61,6 +61,10 @@ class SectionData {
bool empty() const { return m_Fragments.empty(); }
+ static FragmentListType SectionData::*getSublistAccess(Fragment *) {
+ return &SectionData::m_Fragments;
+ }
+
reference front() { return m_Fragments.front(); }
const_reference front() const { return m_Fragments.front(); }
reference back() { return m_Fragments.back(); }