From: Andrew Kaylor <andrew.kaylor@intel.com>
Date: Tue, 1 Oct 2013 16:42:50 +0000 (+0000)
Subject: Fixing MCJIT multiple module linking for OSX
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52c9016db0560644a03ca661302e45143372f2fc;p=oota-llvm.git

Fixing MCJIT multiple module linking for OSX

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191780 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
index 9eaff4d68a2..09fc75c6ae0 100644
--- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp
+++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
@@ -526,6 +526,10 @@ void MCJIT::NotifyFreeingObject(const ObjectImage& Obj) {
 
 uint64_t LinkingMemoryManager::getSymbolAddress(const std::string &Name) {
   uint64_t Result = ParentEngine->getSymbolAddress(Name, false);
+  // If the symbols wasn't found and it begins with an underscore, try again
+  // without the underscore.
+  if (!Result && Name[0] == '_')
+    Result = ParentEngine->getSymbolAddress(Name.substr(1), false);
   if (Result)
     return Result;
   return ClientMM->getSymbolAddress(Name);