commit 119bb9b550f139ace5f69075390937c7f1222761
author Stephen Hines <srhines@google.com> Tue Mar 08 01:14:55 2016 -0800
committer Stephen Hines <srhines@google.com> Sun Mar 20 22:56:53 2016 -0700
tree a7befed71dbf26f45a068ee673db6d79e8b3e404
parent cfcb22478ca64c308df58f9abe6fa2dedb213c16

Fix up mclinker so that it builds/runs for LLVM rebase to r256229.

Bug: http://b/26987366

(cherry picked from commit 07177ff8032d136567f3e99d372cb67713f1bba8)

Change-Id: I5a5da1ed7b115fa9cf8ce5161ea77827715d6ada

include/mcld/Fragment/Fragment.h

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 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 };
 

include/mcld/LD/SectionData.h

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 @@
 
   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(); }