correct and generalize computation of __INTMAX_MAX__.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63848 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 14bddd68266e170fe6f044dcb4111441c117d430..f6a29dbd7c5151ffce09765796630bc7e124967d 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -531,10 +531,22 @@ static void InitializePredefinedMacros(Preprocessor &PP,
   else
     assert(0 && "Unknown long size");
   char MacroBuf[60];
-  sprintf(MacroBuf, "__INTMAX_MAX__=%lld",
-          (TI.getIntMaxType() == TargetInfo::UnsignedLongLong?
-           (1LL << (TI.getLongLongWidth() - 1)) : 
-           ((1LL << (TI.getLongLongWidth() - 2)) - 1)));
+  unsigned IntMaxWidth;
+  const char *IntMaxSuffix;
+  if (TI.getIntMaxType() == TargetInfo::SignedLongLong) {
+    IntMaxWidth = TI.getLongLongWidth();
+    IntMaxSuffix = "LL";
+  } else if (TI.getIntMaxType() == TargetInfo::SignedLong) {
+    IntMaxWidth = TI.getLongWidth();
+    IntMaxSuffix = "L";
+  } else {
+    assert(TI.getIntMaxType() == TargetInfo::SignedInt);
+    IntMaxWidth = TI.getIntWidth();
+    IntMaxSuffix = "";
+  }
+  
+  sprintf(MacroBuf, "__INTMAX_MAX__=%lld%s", (1LL << (IntMaxWidth - 1)) - 1,
+          IntMaxSuffix);
   DefineBuiltinMacro(Buf, MacroBuf);
   
   if (TI.getIntMaxType() == TargetInfo::UnsignedLongLong)