diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 102 | ||||
| -rw-r--r-- | clang/test/Preprocessor/predefined-macros.c | 102 |
2 files changed, 99 insertions, 105 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index daff9ce9114..802b2a95cc8 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -627,12 +627,10 @@ static void InitializePredefinedMacros(const TargetInfo &TI, DefineTypeSize("__INTMAX_MAX__", TI.getIntMaxType(), TI, Builder); DefineTypeSize("__SIZE_MAX__", TI.getSizeType(), TI, Builder); - if (!LangOpts.MSVCCompat) { - DefineTypeSize("__UINTMAX_MAX__", TI.getUIntMaxType(), TI, Builder); - DefineTypeSize("__PTRDIFF_MAX__", TI.getPtrDiffType(0), TI, Builder); - DefineTypeSize("__INTPTR_MAX__", TI.getIntPtrType(), TI, Builder); - DefineTypeSize("__UINTPTR_MAX__", TI.getUIntPtrType(), TI, Builder); - } + DefineTypeSize("__UINTMAX_MAX__", TI.getUIntMaxType(), TI, Builder); + DefineTypeSize("__PTRDIFF_MAX__", TI.getPtrDiffType(0), TI, Builder); + DefineTypeSize("__INTPTR_MAX__", TI.getIntPtrType(), TI, Builder); + DefineTypeSize("__UINTPTR_MAX__", TI.getUIntPtrType(), TI, Builder); DefineTypeSizeof("__SIZEOF_DOUBLE__", TI.getDoubleWidth(), TI, Builder); DefineTypeSizeof("__SIZEOF_FLOAT__", TI.getFloatWidth(), TI, Builder); @@ -680,12 +678,10 @@ static void InitializePredefinedMacros(const TargetInfo &TI, DefineType("__CHAR16_TYPE__", TI.getChar16Type(), Builder); DefineType("__CHAR32_TYPE__", TI.getChar32Type(), Builder); - if (!LangOpts.MSVCCompat) { - DefineTypeWidth("__UINTMAX_WIDTH__", TI.getUIntMaxType(), TI, Builder); - DefineType("__UINTPTR_TYPE__", TI.getUIntPtrType(), Builder); - DefineFmt("__UINTPTR", TI.getUIntPtrType(), TI, Builder); - DefineTypeWidth("__UINTPTR_WIDTH__", TI.getUIntPtrType(), TI, Builder); - } + DefineTypeWidth("__UINTMAX_WIDTH__", TI.getUIntMaxType(), TI, Builder); + DefineType("__UINTPTR_TYPE__", TI.getUIntPtrType(), Builder); + DefineFmt("__UINTPTR", TI.getUIntPtrType(), TI, Builder); + DefineTypeWidth("__UINTPTR_WIDTH__", TI.getUIntPtrType(), TI, Builder); DefineFloatMacros(Builder, "FLT", &TI.getFloatFormat(), "F"); DefineFloatMacros(Builder, "DBL", &TI.getDoubleFormat(), ""); @@ -719,54 +715,52 @@ static void InitializePredefinedMacros(const TargetInfo &TI, if (TI.getLongLongWidth() > TI.getLongWidth()) DefineExactWidthIntType(TargetInfo::SignedLongLong, TI, Builder); - if (!LangOpts.MSVCCompat) { - DefineExactWidthIntType(TargetInfo::UnsignedChar, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::UnsignedChar, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::SignedChar, TI, Builder); - - if (TI.getShortWidth() > TI.getCharWidth()) { - DefineExactWidthIntType(TargetInfo::UnsignedShort, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::UnsignedShort, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::SignedShort, TI, Builder); - } + DefineExactWidthIntType(TargetInfo::UnsignedChar, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::UnsignedChar, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::SignedChar, TI, Builder); - if (TI.getIntWidth() > TI.getShortWidth()) { - DefineExactWidthIntType(TargetInfo::UnsignedInt, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::UnsignedInt, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::SignedInt, TI, Builder); - } + if (TI.getShortWidth() > TI.getCharWidth()) { + DefineExactWidthIntType(TargetInfo::UnsignedShort, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::UnsignedShort, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::SignedShort, TI, Builder); + } - if (TI.getLongWidth() > TI.getIntWidth()) { - DefineExactWidthIntType(TargetInfo::UnsignedLong, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::UnsignedLong, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::SignedLong, TI, Builder); - } + if (TI.getIntWidth() > TI.getShortWidth()) { + DefineExactWidthIntType(TargetInfo::UnsignedInt, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::UnsignedInt, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::SignedInt, TI, Builder); + } - if (TI.getLongLongWidth() > TI.getLongWidth()) { - DefineExactWidthIntType(TargetInfo::UnsignedLongLong, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::UnsignedLongLong, TI, Builder); - DefineExactWidthIntTypeSize(TargetInfo::SignedLongLong, TI, Builder); - } + if (TI.getLongWidth() > TI.getIntWidth()) { + DefineExactWidthIntType(TargetInfo::UnsignedLong, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::UnsignedLong, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::SignedLong, TI, Builder); + } - DefineLeastWidthIntType(8, true, TI, Builder); - DefineLeastWidthIntType(8, false, TI, Builder); - DefineLeastWidthIntType(16, true, TI, Builder); - DefineLeastWidthIntType(16, false, TI, Builder); - DefineLeastWidthIntType(32, true, TI, Builder); - DefineLeastWidthIntType(32, false, TI, Builder); - DefineLeastWidthIntType(64, true, TI, Builder); - DefineLeastWidthIntType(64, false, TI, Builder); - - DefineFastIntType(8, true, TI, Builder); - DefineFastIntType(8, false, TI, Builder); - DefineFastIntType(16, true, TI, Builder); - DefineFastIntType(16, false, TI, Builder); - DefineFastIntType(32, true, TI, Builder); - DefineFastIntType(32, false, TI, Builder); - DefineFastIntType(64, true, TI, Builder); - DefineFastIntType(64, false, TI, Builder); + if (TI.getLongLongWidth() > TI.getLongWidth()) { + DefineExactWidthIntType(TargetInfo::UnsignedLongLong, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::UnsignedLongLong, TI, Builder); + DefineExactWidthIntTypeSize(TargetInfo::SignedLongLong, TI, Builder); } + DefineLeastWidthIntType(8, true, TI, Builder); + DefineLeastWidthIntType(8, false, TI, Builder); + DefineLeastWidthIntType(16, true, TI, Builder); + DefineLeastWidthIntType(16, false, TI, Builder); + DefineLeastWidthIntType(32, true, TI, Builder); + DefineLeastWidthIntType(32, false, TI, Builder); + DefineLeastWidthIntType(64, true, TI, Builder); + DefineLeastWidthIntType(64, false, TI, Builder); + + DefineFastIntType(8, true, TI, Builder); + DefineFastIntType(8, false, TI, Builder); + DefineFastIntType(16, true, TI, Builder); + DefineFastIntType(16, false, TI, Builder); + DefineFastIntType(32, true, TI, Builder); + DefineFastIntType(32, false, TI, Builder); + DefineFastIntType(64, true, TI, Builder); + DefineFastIntType(64, false, TI, Builder); + if (const char *Prefix = TI.getUserLabelPrefix()) Builder.defineMacro("__USER_LABEL_PREFIX__", Prefix); diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c index 1db9080ac34..a32f4a158c9 100644 --- a/clang/test/Preprocessor/predefined-macros.c +++ b/clang/test/Preprocessor/predefined-macros.c @@ -28,59 +28,59 @@ // // RUN: %clang_cc1 %s -E -dM -triple i686-pc-win32 -fms-compatibility \ // RUN: -o - | FileCheck %s --check-prefix=CHECK-MS-STDINT -// CHECK-MS-STDINT-NOT:#define __INT16_MAX__ 32767 -// CHECK-MS-STDINT-NOT:#define __INT32_MAX__ 2147483647 -// CHECK-MS-STDINT-NOT:#define __INT64_MAX__ 9223372036854775807LL -// CHECK-MS-STDINT-NOT:#define __INT8_MAX__ 127 -// CHECK-MS-STDINT-NOT:#define __INTPTR_MAX__ 2147483647 -// CHECK-MS-STDINT-NOT:#define __INT_FAST16_MAX__ 32767 -// CHECK-MS-STDINT-NOT:#define __INT_FAST16_TYPE__ short -// CHECK-MS-STDINT-NOT:#define __INT_FAST32_MAX__ 2147483647 -// CHECK-MS-STDINT-NOT:#define __INT_FAST32_TYPE__ int -// CHECK-MS-STDINT-NOT:#define __INT_FAST64_MAX__ 9223372036854775807LL -// CHECK-MS-STDINT-NOT:#define __INT_FAST64_TYPE__ long long int -// CHECK-MS-STDINT-NOT:#define __INT_FAST8_MAX__ 127 -// CHECK-MS-STDINT-NOT:#define __INT_FAST8_TYPE__ char -// CHECK-MS-STDINT-NOT:#define __INT_LEAST16_MAX__ 32767 -// CHECK-MS-STDINT-NOT:#define __INT_LEAST16_TYPE__ short -// CHECK-MS-STDINT-NOT:#define __INT_LEAST32_MAX__ 2147483647 -// CHECK-MS-STDINT-NOT:#define __INT_LEAST32_TYPE__ int -// CHECK-MS-STDINT-NOT:#define __INT_LEAST64_MAX__ 9223372036854775807LL -// CHECK-MS-STDINT-NOT:#define __INT_LEAST64_TYPE__ long long int -// CHECK-MS-STDINT-NOT:#define __INT_LEAST8_MAX__ 127 -// CHECK-MS-STDINT-NOT:#define __INT_LEAST8_TYPE__ char +// CHECK-MS-STDINT:#define __INT16_MAX__ 32767 +// CHECK-MS-STDINT:#define __INT32_MAX__ 2147483647 +// CHECK-MS-STDINT:#define __INT64_MAX__ 9223372036854775807LL +// CHECK-MS-STDINT:#define __INT8_MAX__ 127 +// CHECK-MS-STDINT:#define __INTPTR_MAX__ 2147483647 +// CHECK-MS-STDINT:#define __INT_FAST16_MAX__ 32767 +// CHECK-MS-STDINT:#define __INT_FAST16_TYPE__ short +// CHECK-MS-STDINT:#define __INT_FAST32_MAX__ 2147483647 +// CHECK-MS-STDINT:#define __INT_FAST32_TYPE__ int +// CHECK-MS-STDINT:#define __INT_FAST64_MAX__ 9223372036854775807LL +// CHECK-MS-STDINT:#define __INT_FAST64_TYPE__ long long int +// CHECK-MS-STDINT:#define __INT_FAST8_MAX__ 127 +// CHECK-MS-STDINT:#define __INT_FAST8_TYPE__ signed char +// CHECK-MS-STDINT:#define __INT_LEAST16_MAX__ 32767 +// CHECK-MS-STDINT:#define __INT_LEAST16_TYPE__ short +// CHECK-MS-STDINT:#define __INT_LEAST32_MAX__ 2147483647 +// CHECK-MS-STDINT:#define __INT_LEAST32_TYPE__ int +// CHECK-MS-STDINT:#define __INT_LEAST64_MAX__ 9223372036854775807LL +// CHECK-MS-STDINT:#define __INT_LEAST64_TYPE__ long long int +// CHECK-MS-STDINT:#define __INT_LEAST8_MAX__ 127 +// CHECK-MS-STDINT:#define __INT_LEAST8_TYPE__ signed char // CHECK-MS-STDINT-NOT:#define __UINT16_C_SUFFIX__ U -// CHECK-MS-STDINT-NOT:#define __UINT16_MAX__ 65535U -// CHECK-MS-STDINT-NOT:#define __UINT16_TYPE__ unsigned short -// CHECK-MS-STDINT-NOT:#define __UINT32_C_SUFFIX__ U -// CHECK-MS-STDINT-NOT:#define __UINT32_MAX__ 4294967295U -// CHECK-MS-STDINT-NOT:#define __UINT32_TYPE__ unsigned int -// CHECK-MS-STDINT-NOT:#define __UINT64_C_SUFFIX__ ULL -// CHECK-MS-STDINT-NOT:#define __UINT64_MAX__ 18446744073709551615ULL -// CHECK-MS-STDINT-NOT:#define __UINT64_TYPE__ long long unsigned int +// CHECK-MS-STDINT:#define __UINT16_MAX__ 65535 +// CHECK-MS-STDINT:#define __UINT16_TYPE__ unsigned short +// CHECK-MS-STDINT:#define __UINT32_C_SUFFIX__ U +// CHECK-MS-STDINT:#define __UINT32_MAX__ 4294967295U +// CHECK-MS-STDINT:#define __UINT32_TYPE__ unsigned int +// CHECK-MS-STDINT:#define __UINT64_C_SUFFIX__ ULL +// CHECK-MS-STDINT:#define __UINT64_MAX__ 18446744073709551615ULL +// CHECK-MS-STDINT:#define __UINT64_TYPE__ long long unsigned int // CHECK-MS-STDINT-NOT:#define __UINT8_C_SUFFIX__ U -// CHECK-MS-STDINT-NOT:#define __UINT8_MAX__ 255U -// CHECK-MS-STDINT-NOT:#define __UINT8_TYPE__ unsigned char -// CHECK-MS-STDINT-NOT:#define __UINTMAX_MAX__ 18446744073709551615ULL -// CHECK-MS-STDINT-NOT:#define __UINTPTR_MAX__ 4294967295U -// CHECK-MS-STDINT-NOT:#define __UINTPTR_TYPE__ unsigned int -// CHECK-MS-STDINT-NOT:#define __UINTPTR_WIDTH__ 32 -// CHECK-MS-STDINT-NOT:#define __UINT_FAST16_MAX__ 65535U -// CHECK-MS-STDINT-NOT:#define __UINT_FAST16_TYPE__ unsigned short -// CHECK-MS-STDINT-NOT:#define __UINT_FAST32_MAX__ 4294967295U -// CHECK-MS-STDINT-NOT:#define __UINT_FAST32_TYPE__ unsigned int -// CHECK-MS-STDINT-NOT:#define __UINT_FAST64_MAX__ 18446744073709551615ULL -// CHECK-MS-STDINT-NOT:#define __UINT_FAST64_TYPE__ long long unsigned int -// CHECK-MS-STDINT-NOT:#define __UINT_FAST8_MAX__ 255U -// CHECK-MS-STDINT-NOT:#define __UINT_FAST8_TYPE__ unsigned char -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST16_MAX__ 65535U -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST16_TYPE__ unsigned short -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST32_MAX__ 4294967295U -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST32_TYPE__ unsigned int -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST64_MAX__ 18446744073709551615ULL -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST64_TYPE__ long long unsigned int -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST8_MAX__ 255U -// CHECK-MS-STDINT-NOT:#define __UINT_LEAST8_TYPE__ unsigned char +// CHECK-MS-STDINT:#define __UINT8_MAX__ 255 +// CHECK-MS-STDINT:#define __UINT8_TYPE__ unsigned char +// CHECK-MS-STDINT:#define __UINTMAX_MAX__ 18446744073709551615ULL +// CHECK-MS-STDINT:#define __UINTPTR_MAX__ 4294967295U +// CHECK-MS-STDINT:#define __UINTPTR_TYPE__ unsigned int +// CHECK-MS-STDINT:#define __UINTPTR_WIDTH__ 32 +// CHECK-MS-STDINT:#define __UINT_FAST16_MAX__ 65535 +// CHECK-MS-STDINT:#define __UINT_FAST16_TYPE__ unsigned short +// CHECK-MS-STDINT:#define __UINT_FAST32_MAX__ 4294967295U +// CHECK-MS-STDINT:#define __UINT_FAST32_TYPE__ unsigned int +// CHECK-MS-STDINT:#define __UINT_FAST64_MAX__ 18446744073709551615ULL +// CHECK-MS-STDINT:#define __UINT_FAST64_TYPE__ long long unsigned int +// CHECK-MS-STDINT:#define __UINT_FAST8_MAX__ 255 +// CHECK-MS-STDINT:#define __UINT_FAST8_TYPE__ unsigned char +// CHECK-MS-STDINT:#define __UINT_LEAST16_MAX__ 65535 +// CHECK-MS-STDINT:#define __UINT_LEAST16_TYPE__ unsigned short +// CHECK-MS-STDINT:#define __UINT_LEAST32_MAX__ 4294967295U +// CHECK-MS-STDINT:#define __UINT_LEAST32_TYPE__ unsigned int +// CHECK-MS-STDINT:#define __UINT_LEAST64_MAX__ 18446744073709551615ULL +// CHECK-MS-STDINT:#define __UINT_LEAST64_TYPE__ long long unsigned int +// CHECK-MS-STDINT:#define __UINT_LEAST8_MAX__ 255 +// CHECK-MS-STDINT:#define __UINT_LEAST8_TYPE__ unsigned char // // RUN: %clang_cc1 %s -E -dM -ffast-math -o - \ // RUN: | FileCheck %s --check-prefix=CHECK-FAST-MATH |
