diff options
Diffstat (limited to 'lib/Lex/Preprocessor.cpp')
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 14bddd6826..f6a29dbd7c 100644 --- 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) |