commit 2bf3f881f79c4d883f379e63725e788c310739a3
author Pirama Arumuga Nainar <pirama@google.com> Tue Apr 21 10:33:13 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Tue Apr 21 16:36:32 2015 -0700
tree 1f73b937828b20d10e1ab145ad84359c2eee114b
parent 991a5f09953efb27591bdf459a6bbf3531c5d1d6

Update mclinker with upstream patches

- Pull upstream mclinker changes up to
  a7afcb5854708dd0684d7f979af2d9f395b4cbc4
- Update Android.mk in lib/Support and tools/mcld/ to handle the new
  option parser.

Change-Id: I3a3aa2ea4c5e2d59caecc8aba3bf3abf087c0986

lib/Object/ObjectLinker.cpp

diff --git a/lib/Object/ObjectLinker.cpp b/lib/Object/ObjectLinker.cpp
index 801cbaf..4d8ffeb 100644
--- a/lib/Object/ObjectLinker.cpp
+++ b/lib/Object/ObjectLinker.cpp
@@ -273,7 +273,7 @@
   }
 
   // Identical code folding
-  if (m_Config.options().getICFMode() != GeneralOptions::ICF_None) {
+  if (m_Config.options().getICFMode() != GeneralOptions::ICF::None) {
     IdenticalCodeFolding icf(m_Config, m_LDBackend, *m_pModule);
     icf.foldIdenticalCode();
   }