1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp
index 5d5ecc4fe7..6cd1c50978 100644
--- a/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/lib/ExecutionEngine/JIT/JIT.cpp
@@ -509,16 +509,17 @@ void *JIT::getPointerToFunction(Function *F) {
            << "' from bitcode file: " << ErrorMsg << "\n";
       abort();
     }
-  }
 
-  if (void *Addr = getPointerToGlobalIfAvailable(F)) {
-    return Addr;
+    // Now retry to get the address.
+    if (void *Addr = getPointerToGlobalIfAvailable(F))
+      return Addr;
   }
 
   MutexGuard locked(lock);
 
   if (F->isDeclaration()) {
-    void *Addr = getPointerToNamedFunction(F->getName());
+    bool AbortOnFailure = F->getLinkage() != GlobalValue::ExternalWeakLinkage;
+    void *Addr = getPointerToNamedFunction(F->getName(), AbortOnFailure);
     addGlobalMapping(F, Addr);
     return Addr;
   }