diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp
index 48885c96ee1..3b7fb4c148b 100644
--- a/lib/Target/X86/X86CodeEmitter.cpp
+++ b/lib/Target/X86/X86CodeEmitter.cpp
@@ -70,7 +70,7 @@ unsigned JITResolver::getLazyResolver(Function *F) {
 
 void JITResolver::CompilationCallback() {
   unsigned *StackPtr = (unsigned*)__builtin_frame_address(0);
-  unsigned RetAddr = (unsigned)__builtin_return_address(0);
+  unsigned RetAddr = (unsigned)(intptr_t)__builtin_return_address(0);
 
   assert(StackPtr[1] == RetAddr &&
          "Could not find return address on the stack!");