diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index 7abb8d59543..ce9a84eecc7 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -64,7 +64,7 @@ void AsmPrinter::emitConstantValueOnly(const Constant *CV) {
     if (((CI->getValue() << 32) >> 32) == CI->getValue())
       O << CI->getValue();
     else
-      O << (unsigned long long)CI->getValue();
+      O << (uint64_t)CI->getValue();
   else if (const ConstantUInt *CI = dyn_cast<ConstantUInt>(CV))
     O << CI->getValue();
   else if (isa<GlobalValue>((Value*)CV)) {