diff --git a/llvm/include/llvm/ExecutionEngine/GenericValue.h b/llvm/include/llvm/ExecutionEngine/GenericValue.h
index 0446795d314d..3fb66a11515e 100644
--- a/llvm/include/llvm/ExecutionEngine/GenericValue.h
+++ b/llvm/include/llvm/ExecutionEngine/GenericValue.h
@@ -19,7 +19,7 @@
 
 namespace llvm {
 
-typedef uint64_t PointerTy;
+typedef uintptr_t PointerTy;
 
 union GenericValue {
   bool            BoolVal;