diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 6d1354c..1a425c2 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -351,9 +351,17 @@
       case 'd': case 'i':
       case 'u': case 'o':
       case 'x': case 'X':
-        if (HowLong == 2)
+        if (HowLong >= 1) {
+          if (HowLong == 1) {
+            // Make sure we use %lld with a 64 bit argument because we might be
+            // compiling LLI on a 32 bit compiler.
+            unsigned Size = strlen(FmtBuf);
+            FmtBuf[Size] = FmtBuf[Size-1];
+            FmtBuf[Size+1] = 0;
+            FmtBuf[Size-1] = 'l';
+          }
           sprintf(Buffer, FmtBuf, Args[ArgNo++].ULongVal);
-        else
+        } else
           sprintf(Buffer, FmtBuf, Args[ArgNo++].IntVal); break;
       case 'e': case 'E': case 'g': case 'G': case 'f':
         sprintf(Buffer, FmtBuf, Args[ArgNo++].DoubleVal); break;