diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index b67dfe1953b..d556e9a47ae 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -699,7 +699,7 @@ uint64_t JITEmitter::getJumpTableEntryAddress(unsigned Index) {
   for (unsigned i = 0; i < Index; ++i)
     Offset += JT[i].MBBs.size() * EntrySize;
   
-  return (uint64_t)((char *)JumpTableBase + Offset);
+  return (intptr_t)((char *)JumpTableBase + Offset);
 }
 
 unsigned char* JITEmitter::allocateGlobal(unsigned size, unsigned alignment)