diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
index 537ca56e0248..6427bf32e888 100644
--- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
@@ -274,6 +274,10 @@ void *JIT::getPointerToFunctionOrStub(Function *F) {
   if (void *Addr = getPointerToGlobalIfAvailable(F))
     return Addr;
 
+  // Get a stub if the target supports it
+  if (void *Addr = TJI.emitFunctionStub(F, *MCE))
+    return Addr;
+
   // Otherwise, if the target doesn't support it, just codegen the function.
   return getPointerToFunction(F);
 }