commit 04c59f3b00def22b7c75f5a490c323cec58a7c71
author Stephen Hines <srhines@google.com> Tue Apr 07 16:30:20 2015 -0700
committer Stephen Hines <srhines@google.com> Tue Apr 07 16:30:20 2015 -0700
tree 28edce8d679cd33e7bcbd473026755b8ee9d68d6
parent fdc86e090cd0308ba880937cf55ed162abfd20a0

Update mclinker for llvm rebase to r233350.

Change-Id: Ic2e8c152e881681d6b827f9ace76bcb87b907147

lib/Object/ObjectLinker.cpp

diff --git a/lib/Object/ObjectLinker.cpp b/lib/Object/ObjectLinker.cpp
index 0ab7315..801cbaf 100644
--- a/lib/Object/ObjectLinker.cpp
+++ b/lib/Object/ObjectLinker.cpp
@@ -383,7 +383,8 @@
           // FIXME: disable debug string merge when doing partial link.
           if (LinkerConfig::Object == m_Config.codeGenType())
             (*sect)->setKind(LDFileFormat::Debug);
-        } // Fall through
+        }
+        // Fall through
         default: {
           if (!(*sect)->hasSectionData())
             continue;  // skip
@@ -835,6 +836,13 @@
       (*iter)->apply(*m_LDBackend.getRelocator());
   }
 
+  // apply relocations created by LD backend
+  for (TargetLDBackend::extra_reloc_iterator
+       iter = m_LDBackend.extra_reloc_begin(),
+       end = m_LDBackend.extra_reloc_end(); iter != end; ++iter) {
+    iter->apply(*m_LDBackend.getRelocator());
+  }
+
   return true;
 }
 
@@ -907,6 +915,13 @@
       writeRelocationResult(*reloc, data);
     }
   }
+
+  // sync relocations created by LD backend
+  for (TargetLDBackend::extra_reloc_iterator
+       iter = m_LDBackend.extra_reloc_begin(),
+       end = m_LDBackend.extra_reloc_end(); iter != end; ++iter) {
+    writeRelocationResult(*iter, data);
+  }
 }
 
 void ObjectLinker::partialSyncRelocationResult(FileOutputBuffer& pOutput) {