commit bb9431acdae76f786f7bedceb9fa671b5f12d3c6
author Lang Hames <lhames@gmail.com> Tue Aug 09 19:27:17 2016 +0000
committer Lang Hames <lhames@gmail.com> Tue Aug 09 19:27:17 2016 +0000
tree 48a173f44d8c510eb29cc754210decdaf3b32be8
parent a203c41dd9553a645f3b5468814552bb08eb8aff

Re-apply r278065 (Weak symbol support in RuntimeDyld) with a fix for ELF.

llvm-svn: 278149

llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h

diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
index 805852b..db9c519 100644
--- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
+++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
@@ -116,11 +116,13 @@
     LinkingResolver(OrcMCJITReplacement &M) : M(M) {}
 
     JITSymbol findSymbol(const std::string &Name) override {
-      return M.findMangledSymbol(Name);
+      return M.ClientResolver->findSymbol(Name);
     }
 
     JITSymbol findSymbolInLogicalDylib(const std::string &Name) override {
-      return M.ClientResolver->findSymbol(Name);
+      if (auto Sym = M.findMangledSymbol(Name))
+        return Sym;
+      return M.ClientResolver->findSymbolInLogicalDylib(Name);
     }
 
   private: