From: Chris Lattner Date: Wed, 4 Nov 2009 23:03:18 +0000 (+0000) Subject: A simple reordering of the definitions in stdint.h and X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06dcf6b09257ac2382a969fc8c7b954adbc4a344;p=clang A simple reordering of the definitions in stdint.h and introduces no new function changes. Patch by Ken Dyck! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86062 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h index f79a0f4af5..f03c1777ab 100644 --- a/lib/Headers/stdint.h +++ b/lib/Headers/stdint.h @@ -42,28 +42,23 @@ * Since we only support pow-2 targets, these map directly to exact width types. */ -#ifndef __int8_t_defined /* glibc does weird things with sys/types.h */ -#define __int8_t_defined -typedef signed __INT8_TYPE__ int8_t; -typedef __INT16_TYPE__ int16_t; -typedef __INT32_TYPE__ int32_t; +/* Some 16-bit targets do not have a 64-bit datatype. Only define the 64-bit + * typedefs if there is something to typedef them to. + */ #ifdef __INT64_TYPE__ +#ifndef __int8_t_defined /* glibc does weird things with sys/types.h */ typedef __INT64_TYPE__ int64_t; #endif +typedef unsigned __INT64_TYPE__ uint64_t; +typedef int64_t int_least64_t; +typedef uint64_t uint_least64_t; +typedef int64_t int_fast64_t; +typedef uint64_t uint_fast64_t; #endif -typedef unsigned __INT8_TYPE__ uint8_t; -typedef int8_t int_least8_t; -typedef uint8_t uint_least8_t; -typedef int8_t int_fast8_t; -typedef uint8_t uint_fast8_t; - -typedef unsigned __INT16_TYPE__ uint16_t; -typedef int16_t int_least16_t; -typedef uint16_t uint_least16_t; -typedef int16_t int_fast16_t; -typedef uint16_t uint_fast16_t; - +#ifndef __int8_t_defined /* glibc does weird things with sys/types.h */ +typedef __INT32_TYPE__ int32_t; +#endif #ifndef __uint32_t_defined /* more glibc compatibility */ #define __uint32_t_defined typedef unsigned __INT32_TYPE__ uint32_t; @@ -73,18 +68,31 @@ typedef uint32_t uint_least32_t; typedef int32_t int_fast32_t; typedef uint32_t uint_fast32_t; -/* Some 16-bit targets do not have a 64-bit datatype. Only define the 64-bit - * typedefs if there is something to typedef them to. - */ -#ifdef __INT64_TYPE__ -typedef unsigned __INT64_TYPE__ uint64_t; -typedef int64_t int_least64_t; -typedef uint64_t uint_least64_t; -typedef int64_t int_fast64_t; -typedef uint64_t uint_fast64_t; + +#ifndef __int8_t_defined /* glibc does weird things with sys/types.h */ +typedef __INT16_TYPE__ int16_t; #endif +typedef unsigned __INT16_TYPE__ uint16_t; +typedef int16_t int_least16_t; +typedef uint16_t uint_least16_t; +typedef int16_t int_fast16_t; +typedef uint16_t uint_fast16_t; +#ifndef __int8_t_defined /* glibc does weird things with sys/types.h */ +typedef signed __INT8_TYPE__ int8_t; +#endif +typedef unsigned __INT8_TYPE__ uint8_t; +typedef int8_t int_least8_t; +typedef uint8_t uint_least8_t; +typedef int8_t int_fast8_t; +typedef uint8_t uint_fast8_t; + +/* prevent glibc sys/types.h from defining conflicting types */ +#ifndef __int8_t_defined +# define __int8_t_defined +#endif /* __int8_t_defined */ + /* C99 7.18.1.4 Integer types capable of holding object pointers. */ #ifndef __intptr_t_defined @@ -98,6 +106,25 @@ typedef unsigned __INTPTR_TYPE__ uintptr_t; typedef __INTMAX_TYPE__ intmax_t; typedef __UINTMAX_TYPE__ uintmax_t; +/* C99 7.18.4 Macros for minimum-width integer constants. + * + * Note that C++ should not check __STDC_CONSTANT_MACROS here, contrary to the + * claims of the C standard (see C++ 18.3.1p2, [cstdint.syn]). + */ + +/* Only define the 64-bit size macros if we have 64-bit support. */ +#ifdef __INT64_TYPE__ +#define INT64_C(v) (v##LL) +#define UINT64_C(v) (v##ULL) +#endif + +#define INT32_C(v) (v) +#define UINT32_C(v) (v##U) +#define INT16_C(v) (v) +#define UINT16_C(v) (v##U) +#define INT8_C(v) (v) +#define UINT8_C(v) (v##U) + /* C99 7.18.2.1 Limits of exact-width integer types. * Fixed sized values have fixed size max/min. * C99 7.18.2.2 Limits of minimum-width integer types. @@ -108,36 +135,6 @@ typedef __UINTMAX_TYPE__ uintmax_t; * claims of the C standard (see C++ 18.3.1p2, [cstdint.syn]). */ -#define INT8_MAX 127 -#define INT8_MIN (-128) -#define UINT8_MAX 255 -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define UINT_FAST8_MAX UINT8_MAX - -#define INT16_MAX 32767 -#define INT16_MIN (-32768) -#define UINT16_MAX 65535 -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define UINT_FAST16_MAX UINT16_MAX - -#define INT32_MAX 2147483647 -#define INT32_MIN (-2147483647-1) -#define UINT32_MAX 4294967295U -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define UINT_FAST32_MAX UINT32_MAX - /* If we do not have 64-bit support, don't define the 64-bit size macros. */ #ifdef __INT64_TYPE__ #define INT64_MAX 9223372036854775807LL @@ -151,6 +148,36 @@ typedef __UINTMAX_TYPE__ uintmax_t; #define UINT_FAST64_MAX UINT64_MAX #endif +#define INT32_MAX 2147483647 +#define INT32_MIN (-2147483647-1) +#define UINT32_MAX 4294967295U +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define UINT_FAST32_MAX UINT32_MAX + +#define INT16_MAX 32767 +#define INT16_MIN (-32768) +#define UINT16_MAX 65535 +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST16_MAX INT16_MAX +#define UINT_FAST16_MAX UINT16_MAX + +#define INT8_MAX 127 +#define INT8_MIN (-128) +#define UINT8_MAX 255 +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define UINT_LEAST8_MAX UINT8_MAX +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST8_MAX INT8_MAX +#define UINT_FAST8_MAX UINT8_MAX + /* C99 7.18.2.4 Limits of integer types capable of holding object pointers. */ /* C99 7.18.3 Limits of other integer types. */ @@ -206,25 +233,6 @@ typedef __UINTMAX_TYPE__ uintmax_t; #define WCHAR_MIN (-__WCHAR_MAX__-1) #endif -/* C99 7.18.4 Macros for minimum-width integer constants. - * - * Note that C++ should not check __STDC_CONSTANT_MACROS here, contrary to the - * claims of the C standard (see C++ 18.3.1p2, [cstdint.syn]). - */ - -#define INT8_C(v) (v) -#define UINT8_C(v) (v##U) -#define INT16_C(v) (v) -#define UINT16_C(v) (v##U) -#define INT32_C(v) (v) -#define UINT32_C(v) (v##U) - -/* Only define the 64-bit size macros if we have 64-bit support. */ -#ifdef __INT64_TYPE__ -#define INT64_C(v) (v##LL) -#define UINT64_C(v) (v##ULL) -#endif - /* 7.18.4.2 Macros for greatest-width integer constants. */ #define INTMAX_C(v) (v##LL) #define UINTMAX_C(v) (v##ULL) diff --git a/test/Preprocessor/stdint.c b/test/Preprocessor/stdint.c index e292bd3ec7..d47b51dbc7 100644 --- a/test/Preprocessor/stdint.c +++ b/test/Preprocessor/stdint.c @@ -1,34 +1,33 @@ // RUN: clang-cc -E -ffreestanding -triple=arm-none-none %s | FileCheck -check-prefix ARM %s && // -// ARM:typedef signed char int8_t; -// ARM:typedef short int16_t; -// ARM:typedef int int32_t; // ARM:typedef long long int int64_t; +// ARM:typedef unsigned long long int uint64_t; +// ARM:typedef int64_t int_least64_t; +// ARM:typedef uint64_t uint_least64_t; +// ARM:typedef int64_t int_fast64_t; +// ARM:typedef uint64_t uint_fast64_t; // -// ARM:typedef unsigned char uint8_t; -// ARM:typedef int8_t int_least8_t; -// ARM:typedef uint8_t uint_least8_t; -// ARM:typedef int8_t int_fast8_t; -// ARM:typedef uint8_t uint_fast8_t; -// +// ARM:typedef int int32_t; +// ARM:typedef unsigned int uint32_t; +// ARM:typedef int32_t int_least32_t; +// ARM:typedef uint32_t uint_least32_t; +// ARM:typedef int32_t int_fast32_t; +// ARM:typedef uint32_t uint_fast32_t; +// +// ARM:typedef short int16_t; // ARM:typedef unsigned short uint16_t; // ARM:typedef int16_t int_least16_t; // ARM:typedef uint16_t uint_least16_t; // ARM:typedef int16_t int_fast16_t; // ARM:typedef uint16_t uint_fast16_t; // -// ARM:typedef unsigned int uint32_t; -// ARM:typedef int32_t int_least32_t; -// ARM:typedef uint32_t uint_least32_t; -// ARM:typedef int32_t int_fast32_t; -// ARM:typedef uint32_t uint_fast32_t; +// ARM:typedef signed char int8_t; +// ARM:typedef unsigned char uint8_t; +// ARM:typedef int8_t int_least8_t; +// ARM:typedef uint8_t uint_least8_t; +// ARM:typedef int8_t int_fast8_t; +// ARM:typedef uint8_t uint_fast8_t; // -// ARM:typedef unsigned long long int uint64_t; -// ARM:typedef int64_t int_least64_t; -// ARM:typedef uint64_t uint_least64_t; -// ARM:typedef int64_t int_fast64_t; -// ARM:typedef uint64_t uint_fast64_t; -// // ARM:typedef long int intptr_t; // ARM:typedef unsigned long int uintptr_t; // @@ -109,35 +108,33 @@ // // RUN: clang-cc -E -ffreestanding -triple=bfin-none-none %s | FileCheck -check-prefix BFIN %s && // -// BFIN:typedef signed char int8_t; -// BFIN:typedef short int16_t; -// BFIN:typedef int int32_t; -// // BFIN:typedef long long int int64_t; +// BFIN:typedef unsigned long long int uint64_t; +// BFIN:typedef int64_t int_least64_t; +// BFIN:typedef uint64_t uint_least64_t; +// BFIN:typedef int64_t int_fast64_t; +// BFIN:typedef uint64_t uint_fast64_t; // -// BFIN:typedef unsigned char uint8_t; -// BFIN:typedef int8_t int_least8_t; -// BFIN:typedef uint8_t uint_least8_t; -// BFIN:typedef int8_t int_fast8_t; -// BFIN:typedef uint8_t uint_fast8_t; +// BFIN:typedef int int32_t; +// BFIN:typedef unsigned int uint32_t; +// BFIN:typedef int32_t int_least32_t; +// BFIN:typedef uint32_t uint_least32_t; +// BFIN:typedef int32_t int_fast32_t; +// BFIN:typedef uint32_t uint_fast32_t; // +// BFIN:typedef short int16_t; // BFIN:typedef unsigned short uint16_t; // BFIN:typedef int16_t int_least16_t; // BFIN:typedef uint16_t uint_least16_t; // BFIN:typedef int16_t int_fast16_t; // BFIN:typedef uint16_t uint_fast16_t; // -// BFIN:typedef unsigned int uint32_t; -// BFIN:typedef int32_t int_least32_t; -// BFIN:typedef uint32_t uint_least32_t; -// BFIN:typedef int32_t int_fast32_t; -// BFIN:typedef uint32_t uint_fast32_t; -// -// BFIN:typedef unsigned long long int uint64_t; -// BFIN:typedef int64_t int_least64_t; -// BFIN:typedef uint64_t uint_least64_t; -// BFIN:typedef int64_t int_fast64_t; -// BFIN:typedef uint64_t uint_fast64_t; +// BFIN:typedef signed char int8_t; +// BFIN:typedef unsigned char uint8_t; +// BFIN:typedef int8_t int_least8_t; +// BFIN:typedef uint8_t uint_least8_t; +// BFIN:typedef int8_t int_fast8_t; +// BFIN:typedef uint8_t uint_fast8_t; // // BFIN:typedef long int intptr_t; // BFIN:typedef unsigned long int uintptr_t; @@ -219,34 +216,33 @@ // // RUN: clang-cc -E -ffreestanding -triple=i386-none-none %s | FileCheck -check-prefix I386 %s && // -// I386:typedef signed char int8_t; -// I386:typedef short int16_t; -// I386:typedef int int32_t; // I386:typedef long long int int64_t; +// I386:typedef unsigned long long int uint64_t; +// I386:typedef int64_t int_least64_t; +// I386:typedef uint64_t uint_least64_t; +// I386:typedef int64_t int_fast64_t; +// I386:typedef uint64_t uint_fast64_t; // -// I386:typedef unsigned char uint8_t; -// I386:typedef int8_t int_least8_t; -// I386:typedef uint8_t uint_least8_t; -// I386:typedef int8_t int_fast8_t; -// I386:typedef uint8_t uint_fast8_t; +// I386:typedef int int32_t; +// I386:typedef unsigned int uint32_t; +// I386:typedef int32_t int_least32_t; +// I386:typedef uint32_t uint_least32_t; +// I386:typedef int32_t int_fast32_t; +// I386:typedef uint32_t uint_fast32_t; // +// I386:typedef short int16_t; // I386:typedef unsigned short uint16_t; // I386:typedef int16_t int_least16_t; // I386:typedef uint16_t uint_least16_t; // I386:typedef int16_t int_fast16_t; // I386:typedef uint16_t uint_fast16_t; // -// I386:typedef unsigned int uint32_t; -// I386:typedef int32_t int_least32_t; -// I386:typedef uint32_t uint_least32_t; -// I386:typedef int32_t int_fast32_t; -// I386:typedef uint32_t uint_fast32_t; -// -// I386:typedef unsigned long long int uint64_t; -// I386:typedef int64_t int_least64_t; -// I386:typedef uint64_t uint_least64_t; -// I386:typedef int64_t int_fast64_t; -// I386:typedef uint64_t uint_fast64_t; +// I386:typedef signed char int8_t; +// I386:typedef unsigned char uint8_t; +// I386:typedef int8_t int_least8_t; +// I386:typedef uint8_t uint_least8_t; +// I386:typedef int8_t int_fast8_t; +// I386:typedef uint8_t uint_fast8_t; // // I386:typedef int intptr_t; // I386:typedef unsigned int uintptr_t; @@ -327,27 +323,26 @@ // // RUN: clang-cc -E -ffreestanding -triple=msp430-none-none %s | FileCheck -check-prefix MSP430 %s && // -// MSP430:typedef signed char int8_t; -// MSP430:typedef short int16_t; // MSP430:typedef long long int32_t; +// MSP430:typedef unsigned long long uint32_t; +// MSP430:typedef int32_t int_least32_t; +// MSP430:typedef uint32_t uint_least32_t; +// MSP430:typedef int32_t int_fast32_t; +// MSP430:typedef uint32_t uint_fast32_t; // -// MSP430:typedef unsigned char uint8_t; -// MSP430:typedef int8_t int_least8_t; -// MSP430:typedef uint8_t uint_least8_t; -// MSP430:typedef int8_t int_fast8_t; -// MSP430:typedef uint8_t uint_fast8_t; -// +// MSP430:typedef short int16_t; // MSP430:typedef unsigned short uint16_t; // MSP430:typedef int16_t int_least16_t; // MSP430:typedef uint16_t uint_least16_t; // MSP430:typedef int16_t int_fast16_t; // MSP430:typedef uint16_t uint_fast16_t; // -// MSP430:typedef unsigned long long uint32_t; -// MSP430:typedef int32_t int_least32_t; -// MSP430:typedef uint32_t uint_least32_t; -// MSP430:typedef int32_t int_fast32_t; -// MSP430:typedef uint32_t uint_fast32_t; +// MSP430:typedef signed char int8_t; +// MSP430:typedef unsigned char uint8_t; +// MSP430:typedef int8_t int_least8_t; +// MSP430:typedef uint8_t uint_least8_t; +// MSP430:typedef int8_t int_fast8_t; +// MSP430:typedef uint8_t uint_fast8_t; // // MSP430:typedef short intptr_t; // MSP430:typedef unsigned short uintptr_t; @@ -428,27 +423,26 @@ // // RUN: clang-cc -E -ffreestanding -triple=pic16-none-none %s | FileCheck -check-prefix PIC16 %s && // -// PIC16:typedef signed char int8_t; -// PIC16:typedef short int16_t; // PIC16:typedef long long int32_t; +// PIC16:typedef unsigned long long uint32_t; +// PIC16:typedef int32_t int_least32_t; +// PIC16:typedef uint32_t uint_least32_t; +// PIC16:typedef int32_t int_fast32_t; +// PIC16:typedef uint32_t uint_fast32_t; // -// PIC16:typedef unsigned char uint8_t; -// PIC16:typedef int8_t int_least8_t; -// PIC16:typedef uint8_t uint_least8_t; -// PIC16:typedef int8_t int_fast8_t; -// PIC16:typedef uint8_t uint_fast8_t; -// +// PIC16:typedef short int16_t; // PIC16:typedef unsigned short uint16_t; // PIC16:typedef int16_t int_least16_t; // PIC16:typedef uint16_t uint_least16_t; // PIC16:typedef int16_t int_fast16_t; // PIC16:typedef uint16_t uint_fast16_t; // -// PIC16:typedef unsigned long long uint32_t; -// PIC16:typedef int32_t int_least32_t; -// PIC16:typedef uint32_t uint_least32_t; -// PIC16:typedef int32_t int_fast32_t; -// PIC16:typedef uint32_t uint_fast32_t; +// PIC16:typedef signed char int8_t; +// PIC16:typedef unsigned char uint8_t; +// PIC16:typedef int8_t int_least8_t; +// PIC16:typedef uint8_t uint_least8_t; +// PIC16:typedef int8_t int_fast8_t; +// PIC16:typedef uint8_t uint_fast8_t; // // PIC16:typedef short intptr_t; // PIC16:typedef unsigned short uintptr_t; @@ -529,34 +523,33 @@ // // RUN: clang-cc -E -ffreestanding -triple=powerpc64-none-none %s | FileCheck -check-prefix PPC64 %s && // -// PPC64:typedef signed char int8_t; -// PPC64:typedef short int16_t; -// PPC64:typedef int int32_t; // PPC64:typedef long int int64_t; +// PPC64:typedef unsigned long int uint64_t; +// PPC64:typedef int64_t int_least64_t; +// PPC64:typedef uint64_t uint_least64_t; +// PPC64:typedef int64_t int_fast64_t; +// PPC64:typedef uint64_t uint_fast64_t; // -// PPC64:typedef unsigned char uint8_t; -// PPC64:typedef int8_t int_least8_t; -// PPC64:typedef uint8_t uint_least8_t; -// PPC64:typedef int8_t int_fast8_t; -// PPC64:typedef uint8_t uint_fast8_t; +// PPC64:typedef int int32_t; +// PPC64:typedef unsigned int uint32_t; +// PPC64:typedef int32_t int_least32_t; +// PPC64:typedef uint32_t uint_least32_t; +// PPC64:typedef int32_t int_fast32_t; +// PPC64:typedef uint32_t uint_fast32_t; // +// PPC64:typedef short int16_t; // PPC64:typedef unsigned short uint16_t; // PPC64:typedef int16_t int_least16_t; // PPC64:typedef uint16_t uint_least16_t; // PPC64:typedef int16_t int_fast16_t; // PPC64:typedef uint16_t uint_fast16_t; // -// PPC64:typedef unsigned int uint32_t; -// PPC64:typedef int32_t int_least32_t; -// PPC64:typedef uint32_t uint_least32_t; -// PPC64:typedef int32_t int_fast32_t; -// PPC64:typedef uint32_t uint_fast32_t; -// -// PPC64:typedef unsigned long int uint64_t; -// PPC64:typedef int64_t int_least64_t; -// PPC64:typedef uint64_t uint_least64_t; -// PPC64:typedef int64_t int_fast64_t; -// PPC64:typedef uint64_t uint_fast64_t; +// PPC64:typedef signed char int8_t; +// PPC64:typedef unsigned char uint8_t; +// PPC64:typedef int8_t int_least8_t; +// PPC64:typedef uint8_t uint_least8_t; +// PPC64:typedef int8_t int_fast8_t; +// PPC64:typedef uint8_t uint_fast8_t; // // PPC64:typedef long int intptr_t; // PPC64:typedef unsigned long int uintptr_t; @@ -637,34 +630,34 @@ // // RUN: clang-cc -E -ffreestanding -triple=powerpc-none-none %s | FileCheck -check-prefix PPC %s && // -// PPC:typedef signed char int8_t; -// PPC:typedef short int16_t; -// PPC:typedef int int32_t; +// // PPC:typedef long long int int64_t; +// PPC:typedef unsigned long long int uint64_t; +// PPC:typedef int64_t int_least64_t; +// PPC:typedef uint64_t uint_least64_t; +// PPC:typedef int64_t int_fast64_t; +// PPC:typedef uint64_t uint_fast64_t; // -// PPC:typedef unsigned char uint8_t; -// PPC:typedef int8_t int_least8_t; -// PPC:typedef uint8_t uint_least8_t; -// PPC:typedef int8_t int_fast8_t; -// PPC:typedef uint8_t uint_fast8_t; +// PPC:typedef int int32_t; +// PPC:typedef unsigned int uint32_t; +// PPC:typedef int32_t int_least32_t; +// PPC:typedef uint32_t uint_least32_t; +// PPC:typedef int32_t int_fast32_t; +// PPC:typedef uint32_t uint_fast32_t; // +// PPC:typedef short int16_t; // PPC:typedef unsigned short uint16_t; // PPC:typedef int16_t int_least16_t; // PPC:typedef uint16_t uint_least16_t; // PPC:typedef int16_t int_fast16_t; // PPC:typedef uint16_t uint_fast16_t; // -// PPC:typedef unsigned int uint32_t; -// PPC:typedef int32_t int_least32_t; -// PPC:typedef uint32_t uint_least32_t; -// PPC:typedef int32_t int_fast32_t; -// PPC:typedef uint32_t uint_fast32_t; -// -// PPC:typedef unsigned long long int uint64_t; -// PPC:typedef int64_t int_least64_t; -// PPC:typedef uint64_t uint_least64_t; -// PPC:typedef int64_t int_fast64_t; -// PPC:typedef uint64_t uint_fast64_t; +// PPC:typedef signed char int8_t; +// PPC:typedef unsigned char uint8_t; +// PPC:typedef int8_t int_least8_t; +// PPC:typedef uint8_t uint_least8_t; +// PPC:typedef int8_t int_fast8_t; +// PPC:typedef uint8_t uint_fast8_t; // // PPC:typedef long int intptr_t; // PPC:typedef unsigned long int uintptr_t; @@ -745,34 +738,33 @@ // // RUN: clang-cc -E -ffreestanding -triple=s390x-none-none %s | FileCheck -check-prefix S390X %s && // -// S390X:typedef signed char int8_t; -// S390X:typedef short int16_t; -// S390X:typedef int int32_t; // S390X:typedef long long int int64_t; +// S390X:typedef unsigned long long int uint64_t; +// S390X:typedef int64_t int_least64_t; +// S390X:typedef uint64_t uint_least64_t; +// S390X:typedef int64_t int_fast64_t; +// S390X:typedef uint64_t uint_fast64_t; // -// S390X:typedef unsigned char uint8_t; -// S390X:typedef int8_t int_least8_t; -// S390X:typedef uint8_t uint_least8_t; -// S390X:typedef int8_t int_fast8_t; -// S390X:typedef uint8_t uint_fast8_t; +// S390X:typedef int int32_t; +// S390X:typedef unsigned int uint32_t; +// S390X:typedef int32_t int_least32_t; +// S390X:typedef uint32_t uint_least32_t; +// S390X:typedef int32_t int_fast32_t; +// S390X:typedef uint32_t uint_fast32_t; // +// S390X:typedef short int16_t; // S390X:typedef unsigned short uint16_t; // S390X:typedef int16_t int_least16_t; // S390X:typedef uint16_t uint_least16_t; // S390X:typedef int16_t int_fast16_t; // S390X:typedef uint16_t uint_fast16_t; // -// S390X:typedef unsigned int uint32_t; -// S390X:typedef int32_t int_least32_t; -// S390X:typedef uint32_t uint_least32_t; -// S390X:typedef int32_t int_fast32_t; -// S390X:typedef uint32_t uint_fast32_t; -// -// S390X:typedef unsigned long long int uint64_t; -// S390X:typedef int64_t int_least64_t; -// S390X:typedef uint64_t uint_least64_t; -// S390X:typedef int64_t int_fast64_t; -// S390X:typedef uint64_t uint_fast64_t; +// S390X:typedef signed char int8_t; +// S390X:typedef unsigned char uint8_t; +// S390X:typedef int8_t int_least8_t; +// S390X:typedef uint8_t uint_least8_t; +// S390X:typedef int8_t int_fast8_t; +// S390X:typedef uint8_t uint_fast8_t; // // S390X:typedef long int intptr_t; // S390X:typedef unsigned long int uintptr_t; @@ -853,34 +845,33 @@ // // RUN: clang-cc -E -ffreestanding -triple=sparc-none-none %s | FileCheck -check-prefix SPARC %s && // -// SPARC:typedef signed char int8_t; -// SPARC:typedef short int16_t; -// SPARC:typedef int int32_t; // SPARC:typedef long long int int64_t; +// SPARC:typedef unsigned long long int uint64_t; +// SPARC:typedef int64_t int_least64_t; +// SPARC:typedef uint64_t uint_least64_t; +// SPARC:typedef int64_t int_fast64_t; +// SPARC:typedef uint64_t uint_fast64_t; // -// SPARC:typedef unsigned char uint8_t; -// SPARC:typedef int8_t int_least8_t; -// SPARC:typedef uint8_t uint_least8_t; -// SPARC:typedef int8_t int_fast8_t; -// SPARC:typedef uint8_t uint_fast8_t; +// SPARC:typedef int int32_t; +// SPARC:typedef unsigned int uint32_t; +// SPARC:typedef int32_t int_least32_t; +// SPARC:typedef uint32_t uint_least32_t; +// SPARC:typedef int32_t int_fast32_t; +// SPARC:typedef uint32_t uint_fast32_t; // +// SPARC:typedef short int16_t; // SPARC:typedef unsigned short uint16_t; // SPARC:typedef int16_t int_least16_t; // SPARC:typedef uint16_t uint_least16_t; // SPARC:typedef int16_t int_fast16_t; // SPARC:typedef uint16_t uint_fast16_t; // -// SPARC:typedef unsigned int uint32_t; -// SPARC:typedef int32_t int_least32_t; -// SPARC:typedef uint32_t uint_least32_t; -// SPARC:typedef int32_t int_fast32_t; -// SPARC:typedef uint32_t uint_fast32_t; -// -// SPARC:typedef unsigned long long int uint64_t; -// SPARC:typedef int64_t int_least64_t; -// SPARC:typedef uint64_t uint_least64_t; -// SPARC:typedef int64_t int_fast64_t; -// SPARC:typedef uint64_t uint_fast64_t; +// SPARC:typedef signed char int8_t; +// SPARC:typedef unsigned char uint8_t; +// SPARC:typedef int8_t int_least8_t; +// SPARC:typedef uint8_t uint_least8_t; +// SPARC:typedef int8_t int_fast8_t; +// SPARC:typedef uint8_t uint_fast8_t; // // SPARC:typedef long int intptr_t; // SPARC:typedef unsigned long int uintptr_t; @@ -961,27 +952,26 @@ // // RUN: clang-cc -E -ffreestanding -triple=tce-none-none %s | FileCheck -check-prefix TCE %s && // -// TCE:typedef signed char int8_t; -// TCE:typedef short int16_t; // TCE:typedef int int32_t; +// TCE:typedef unsigned int uint32_t; +// TCE:typedef int32_t int_least32_t; +// TCE:typedef uint32_t uint_least32_t; +// TCE:typedef int32_t int_fast32_t; +// TCE:typedef uint32_t uint_fast32_t; // -// TCE:typedef unsigned char uint8_t; -// TCE:typedef int8_t int_least8_t; -// TCE:typedef uint8_t uint_least8_t; -// TCE:typedef int8_t int_fast8_t; -// TCE:typedef uint8_t uint_fast8_t; -// +// TCE:typedef short int16_t; // TCE:typedef unsigned short uint16_t; // TCE:typedef int16_t int_least16_t; // TCE:typedef uint16_t uint_least16_t; // TCE:typedef int16_t int_fast16_t; // TCE:typedef uint16_t uint_fast16_t; // -// TCE:typedef unsigned int uint32_t; -// TCE:typedef int32_t int_least32_t; -// TCE:typedef uint32_t uint_least32_t; -// TCE:typedef int32_t int_fast32_t; -// TCE:typedef uint32_t uint_fast32_t; +// TCE:typedef signed char int8_t; +// TCE:typedef unsigned char uint8_t; +// TCE:typedef int8_t int_least8_t; +// TCE:typedef uint8_t uint_least8_t; +// TCE:typedef int8_t int_fast8_t; +// TCE:typedef uint8_t uint_fast8_t; // // TCE:typedef int intptr_t; // TCE:typedef unsigned int uintptr_t; @@ -1062,34 +1052,34 @@ // // RUN: clang-cc -E -ffreestanding -triple=x86_64-none-none %s | FileCheck -check-prefix X86_64 %s && // -// X86_64:typedef signed char int8_t; -// X86_64:typedef short int16_t; -// X86_64:typedef int int32_t; +// // X86_64:typedef long int int64_t; +// X86_64:typedef unsigned long int uint64_t; +// X86_64:typedef int64_t int_least64_t; +// X86_64:typedef uint64_t uint_least64_t; +// X86_64:typedef int64_t int_fast64_t; +// X86_64:typedef uint64_t uint_fast64_t; // -// X86_64:typedef unsigned char uint8_t; -// X86_64:typedef int8_t int_least8_t; -// X86_64:typedef uint8_t uint_least8_t; -// X86_64:typedef int8_t int_fast8_t; -// X86_64:typedef uint8_t uint_fast8_t; +// X86_64:typedef int int32_t; +// X86_64:typedef unsigned int uint32_t; +// X86_64:typedef int32_t int_least32_t; +// X86_64:typedef uint32_t uint_least32_t; +// X86_64:typedef int32_t int_fast32_t; +// X86_64:typedef uint32_t uint_fast32_t; // +// X86_64:typedef short int16_t; // X86_64:typedef unsigned short uint16_t; // X86_64:typedef int16_t int_least16_t; // X86_64:typedef uint16_t uint_least16_t; // X86_64:typedef int16_t int_fast16_t; // X86_64:typedef uint16_t uint_fast16_t; // -// X86_64:typedef unsigned int uint32_t; -// X86_64:typedef int32_t int_least32_t; -// X86_64:typedef uint32_t uint_least32_t; -// X86_64:typedef int32_t int_fast32_t; -// X86_64:typedef uint32_t uint_fast32_t; -// -// X86_64:typedef unsigned long int uint64_t; -// X86_64:typedef int64_t int_least64_t; -// X86_64:typedef uint64_t uint_least64_t; -// X86_64:typedef int64_t int_fast64_t; -// X86_64:typedef uint64_t uint_fast64_t; +// X86_64:typedef signed char int8_t; +// X86_64:typedef unsigned char uint8_t; +// X86_64:typedef int8_t int_least8_t; +// X86_64:typedef uint8_t uint_least8_t; +// X86_64:typedef int8_t int_fast8_t; +// X86_64:typedef uint8_t uint_fast8_t; // // X86_64:typedef long int intptr_t; // X86_64:typedef unsigned long int uintptr_t;