Headers: Make the type of SIZE_MAX the same as size_t

[dexonsmith]

Summary

size_t is usually defined as unsigned long, but on 64-bit platforms,
stdint.h currently defines SIZE_MAX using "ull" (unsigned long long).
Although this is the same width, it doesn't necessarily have the same
alignment or calling convention. It also triggers printf warnings when
using the format flag "%zu" to print SIZE_MAX.

1. Is there a better way to get the right type for SIZE_MAX?
2. Should we do this for ptrdiff_t as well?

[dexonsmith]

Updated clang/test/Preprocessor/stdint.c, which I missed in the original patch.

[dexonsmith]

+Hal and Richard, a couple of possible reviewers.

[dexonsmith]

Ping.

[rsmith]

This is sadly not a correct change. The relevant requirements (C11 7.20.3/2) on these macros are:

Each instance of these macros shall be replaced by a constant expression suitable for use in #if preprocessing directives, and this expression shall have the same type as would an expression that is an object of the corresponding type converted according to the integer promotions.

The "suitable for use in #if" requirement means that you cannot use a cast, and must instead use a suitable numeric suffix.

Can we instead use __SIZE_MAX__? (And likewise for ptrdiff_t etc.)

clang/test/Preprocessor/stdint.c

1416

Do we really define __SIZE_TYPE__ to unsigned a for some target?

[dexonsmith]

Thanks for the review. __SIZE_MAX__ makes sense to me; and better even if not for the #if requirement. I'll do that for both SIZE_MAX and PTRDIFF_MAX when I get a chance.

clang/test/Preprocessor/stdint.c

1416

This testcase has a #define int a to confirm that we get intmax_t from our token pasting instead of amax_t. unsigned a looks bogus, but I figure such a user is getting what they asked for.

[dexonsmith]

Hmm... presumably, this test should pass:

$ ./bin/clang -nostdinc -isystem ./lib/clang/5.0.0/include -std=c++1z -fsyntax-only t.cpp
t.cpp:3:1: error: static_assert failed
static_assert(__is_same(intptr_t, __INTPTR_TYPE__));
^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
t.cpp:4:1: error: static_assert failed
static_assert(__is_same(uintptr_t, __UINTPTR_TYPE__));
^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
$ cat t.cpp 
#include <stdint.h>

static_assert(__is_same(intptr_t, __INTPTR_TYPE__));
static_assert(__is_same(uintptr_t, __UINTPTR_TYPE__));

Discovered that it fails (at least for -triple x86_64-apple-macosx10.12.0) while writing tests for an improved patch that covers SIZE_MAX, PTRDIFF_MIN/MAX, UINTPTR_MAX, and INTPTR_MAX, since I was trying:

static_assert(__is_same(__typeof__(INTPTR_MIN), intptr_t));
static_assert(__is_same(__typeof__(INTPTR_MAX), intptr_t));
static_assert(__is_same(__typeof__(UINTPTR_MAX), uintptr_t));
static_assert(__is_same(__typeof__(PTRDIFF_MIN), ptrdiff_t));
static_assert(__is_same(__typeof__(PTRDIFF_MAX), ptrdiff_t));
static_assert(__is_same(__typeof__(SIZE_MAX), size_t));

and the first three assertions all failed.

Is __INTPTR_TYPE__ correct, or is intptr_t? Is it safe to fix the one that's wrong?

[dexonsmith]

Here's an updated patch that uses __SIZE_MAX__ and also handles the other pointer-like integers.

However, the first three static asserts fail, because intptr_t and __INTPTR_TYPE__ are different types (same for uintptr_t and __UINTPTR_TYPE__).

[dexonsmith]

It looks like __INTPTR_TYPE__ was introduced in r64495 in order to help define intptr_t, and then they diverged in r89237.

Changing intptr_t would change the mangling of symbols in libcxx, so that doesn't seem safe. Is it safe to change __INTPTR_TYPE__?

[efriedma]

We normally use stdint.h from the host C library, rather than our own version; this file is only relevant in -ffreestanding mode. So it should be safe to change.

[rsmith]

In D31856#733845, @efriedma wrote:

We normally use stdint.h from the host C library, rather than our own version; this file is only relevant in -ffreestanding mode. So it should be safe to change.

Agreed; r89237 (and nearby changes: r89221, r89224, r89226) are simply wrong. We cannot determine the correct types from the bitwidth alone; there may be multiple types with the relevant width and we must pick the right one. If we back out all of those changes and instead use the correct types as provided by __*_TYPE__, we should be able to remove the __*_WIDTH__ macros too.

[dexonsmith]

Thanks Eli and Richard.

Given that, I've thrown in fixes for INTMAX_MIN, INTMAX_MAX, UINTMAX_MAX, INTMAX_C(), and UINTMAX_C(), as well as fixing the typedefs for intptr_t, uintptr_t, intmax_t, and uintmax_t.

For the static assert type tests, I've explicitly added RUN lines for all the targets tested in test/Preprocessor/stdint.c.

I left out removing __INTPTR_WIDTH__, etc., since I wondered if the CHECK lines for their values were useful on their own. We could kill those in a follow-up though.

[dexonsmith]

clang/test/Headers/stdint-typeof-MINMAX.cpp

1

I copied the -ffreestanding out of test/Preprocessor/stdint.c, but I'm wondering if it even serves a purpose here... if not, we could make the RUN lines shorter (and fit 80 columns without breaking in two).

[efriedma]

clang/test/Headers/stdint-typeof-MINMAX.cpp

1

Without -ffreestanding, you're testing the contents of /usr/include/stdint.h rather than the compiler's builtin header.

[dexonsmith]

clang/test/Headers/stdint-typeof-MINMAX.cpp

1

Ah; I found no difference locally because I have no /usr/include. -v shows me:

ignoring nonexistent directory "/usr/include"

-nostdsysteminc has the same effect as -ffreestanding... but I guess I may as well leave it as is.

[efriedma]

LGTM.

[dexonsmith]

Thanks for the reviews! Committed in r301593.

[dexonsmith]

rsmith: I just noticed you still have a red "X" here (since Phab won't let me "close"). I think I addressed your comments, but let me know if you want me to revert until you have time to look.

clang/lib/Headers/stdint.h

 #ifndef __int8_t_defined
 # define __int8_t_defined
 #endif /* __int8_t_defined */
 
 /* C99 7.18.1.4 Integer types capable of holding object pointers.
  */
 #define __stdint_join3(a,b,c) a ## b ## c
 
-#define  __intn_t(n) __stdint_join3( int, n, _t)
-#define __uintn_t(n) __stdint_join3(uint, n, _t)
-
 #ifndef _INTPTR_T
 #ifndef __intptr_t_defined
-typedef  __intn_t(__INTPTR_WIDTH__)  intptr_t;
+typedef __INTPTR_TYPE__ intptr_t;
 #define __intptr_t_defined
 #define _INTPTR_T
 #endif
 #endif
 
 #ifndef _UINTPTR_T
-typedef __uintn_t(__INTPTR_WIDTH__) uintptr_t;
+typedef __UINTPTR_TYPE__ uintptr_t;
 #define _UINTPTR_T
 #endif
 
 /* C99 7.18.1.5 Greatest-width integer types.
  */
 typedef __INTMAX_TYPE__  intmax_t;
 typedef __UINTMAX_TYPE__ uintmax_t;
 

 #define  __INTN_MAX(n)  __stdint_join3( INT, n, _MAX)
 #define __UINTN_MAX(n)  __stdint_join3(UINT, n, _MAX)
 #define  __INTN_C(n, v) __stdint_join3( INT, n, _C(v))
 #define __UINTN_C(n, v) __stdint_join3(UINT, n, _C(v))
 
 /* C99 7.18.2.4 Limits of integer types capable of holding object pointers. */
 /* C99 7.18.3 Limits of other integer types. */
 
-#define  INTPTR_MIN  __INTN_MIN(__INTPTR_WIDTH__)
-#define  INTPTR_MAX  __INTN_MAX(__INTPTR_WIDTH__)
-#define UINTPTR_MAX __UINTN_MAX(__INTPTR_WIDTH__)
-#define PTRDIFF_MIN  __INTN_MIN(__PTRDIFF_WIDTH__)
-#define PTRDIFF_MAX  __INTN_MAX(__PTRDIFF_WIDTH__)
-#define    SIZE_MAX __UINTN_MAX(__SIZE_WIDTH__)
+#define  INTPTR_MIN  (-__INTPTR_MAX__-1)
+#define  INTPTR_MAX    __INTPTR_MAX__
+#define UINTPTR_MAX   __UINTPTR_MAX__
+#define PTRDIFF_MIN (-__PTRDIFF_MAX__-1)
+#define PTRDIFF_MAX   __PTRDIFF_MAX__
+#define    SIZE_MAX      __SIZE_MAX__
 
 /* ISO9899:2011 7.20 (C11 Annex K): Define RSIZE_MAX if __STDC_WANT_LIB_EXT1__
  * is enabled. */
 #if defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1
 #define   RSIZE_MAX            (SIZE_MAX >> 1)
 #endif
 
 /* C99 7.18.2.5 Limits of greatest-width integer types. */
-#define INTMAX_MIN   __INTN_MIN(__INTMAX_WIDTH__)
-#define INTMAX_MAX   __INTN_MAX(__INTMAX_WIDTH__)
-#define UINTMAX_MAX __UINTN_MAX(__INTMAX_WIDTH__)
+#define  INTMAX_MIN (-__INTMAX_MAX__-1)
+#define  INTMAX_MAX   __INTMAX_MAX__
+#define UINTMAX_MAX  __UINTMAX_MAX__
 
 /* C99 7.18.3 Limits of other integer types. */
 #define SIG_ATOMIC_MIN __INTN_MIN(__SIG_ATOMIC_WIDTH__)
 #define SIG_ATOMIC_MAX __INTN_MAX(__SIG_ATOMIC_WIDTH__)
 #ifdef __WINT_UNSIGNED__
 # define WINT_MIN       __UINTN_C(__WINT_WIDTH__, 0)
 # define WINT_MAX       __UINTN_MAX(__WINT_WIDTH__)
 #else
 # define WINT_MIN       __INTN_MIN(__WINT_WIDTH__)
 # define WINT_MAX       __INTN_MAX(__WINT_WIDTH__)
 #endif
 
 #ifndef WCHAR_MAX
 # define WCHAR_MAX __WCHAR_MAX__
 #endif
 #ifndef WCHAR_MIN
 # if __WCHAR_MAX__ == __INTN_MAX(__WCHAR_WIDTH__)
 #  define WCHAR_MIN __INTN_MIN(__WCHAR_WIDTH__)
 # else
 #  define WCHAR_MIN __UINTN_C(__WCHAR_WIDTH__, 0)
 # endif
 #endif
 
 /* 7.18.4.2 Macros for greatest-width integer constants. */
-#define INTMAX_C(v)   __INTN_C(__INTMAX_WIDTH__, v)
-#define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v)
+#define  INTMAX_C(v) __int_c(v,  __INTMAX_C_SUFFIX__)
+#define UINTMAX_C(v) __int_c(v, __UINTMAX_C_SUFFIX__)
 
 #endif /* __STDC_HOSTED__ */
 #endif /* __CLANG_STDINT_H */

clang/test/Headers/stdint-typeof-MINMAX.cpp

+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=aarch64-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=arm-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=i386-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=mips-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=mips64-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=msp430-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=powerpc64-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=powerpc64-none-netbsd
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=powerpc-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=s390x-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=sparc-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=tce-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=x86_64-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=x86_64-pc-linux-gnu
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=i386-mingw32
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only -triple=xcore-none-none
+// RUN: %clang_cc1 %s -ffreestanding -std=c++1z -fsyntax-only
+
+#include <stdint.h>
+#include <stddef.h>
+
+static_assert(__is_same(__typeof__(INTPTR_MIN), intptr_t));
+static_assert(__is_same(__typeof__(INTPTR_MAX), intptr_t));
+static_assert(__is_same(__typeof__(UINTPTR_MAX), uintptr_t));
+static_assert(__is_same(__typeof__(PTRDIFF_MIN), ptrdiff_t));
+static_assert(__is_same(__typeof__(PTRDIFF_MAX), ptrdiff_t));
+static_assert(__is_same(__typeof__(SIZE_MAX), size_t));
+static_assert(__is_same(__typeof__(INTMAX_MIN), intmax_t));
+static_assert(__is_same(__typeof__(INTMAX_MAX), intmax_t));
+static_assert(__is_same(__typeof__(UINTMAX_MAX), uintmax_t));
+static_assert(__is_same(__typeof__(INTMAX_C(5)), intmax_t));
+static_assert(__is_same(__typeof__(UINTMAX_C(5)), uintmax_t));

clang/test/Preprocessor/stdint.c

 //
 // 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 int32_t intptr_t;
-// ARM:typedef uint32_t uintptr_t;
+// ARM:typedef long int intptr_t;
+// ARM:typedef long unsigned int uintptr_t;
 // 
 // ARM:typedef long long int intmax_t;
 // ARM:typedef long long unsigned int uintmax_t;
 //
 // ARM:INT8_MAX_ 127
 // ARM:INT8_MIN_ (-127 -1)
 // ARM:UINT8_MAX_ 255
 // ARM:INT_LEAST8_MIN_ (-127 -1)

 // ARM:UINT64_MAX_ 18446744073709551615ULL
 // ARM:INT_LEAST64_MIN_ (-9223372036854775807LL -1)
 // ARM:INT_LEAST64_MAX_ 9223372036854775807LL
 // ARM:UINT_LEAST64_MAX_ 18446744073709551615ULL
 // ARM:INT_FAST64_MIN_ (-9223372036854775807LL -1)
 // ARM:INT_FAST64_MAX_ 9223372036854775807LL
 // ARM:UINT_FAST64_MAX_ 18446744073709551615ULL
 //
-// ARM:INTPTR_MIN_ (-2147483647 -1)
-// ARM:INTPTR_MAX_ 2147483647
-// ARM:UINTPTR_MAX_ 4294967295U
+// ARM:INTPTR_MIN_ (-2147483647L -1)
+// ARM:INTPTR_MAX_ 2147483647L
+// ARM:UINTPTR_MAX_ 4294967295UL
 // ARM:PTRDIFF_MIN_ (-2147483647 -1)
 // ARM:PTRDIFF_MAX_ 2147483647
 // ARM:SIZE_MAX_ 4294967295U
 //
 // ARM:INTMAX_MIN_ (-9223372036854775807LL -1)
 // ARM:INTMAX_MAX_ 9223372036854775807LL
 // ARM:UINTMAX_MAX_ 18446744073709551615ULL
 //

 //
 // 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 int32_t intptr_t;
-// I386:typedef uint32_t uintptr_t;
+// I386:typedef int intptr_t;
+// I386:typedef unsigned int uintptr_t;
 //
 // I386:typedef long long int intmax_t;
 // I386:typedef long long unsigned int uintmax_t;
 //
 // I386:INT8_MAX_ 127
 // I386:INT8_MIN_ (-127 -1)
 // I386:UINT8_MAX_ 255
 // I386:INT_LEAST8_MIN_ (-127 -1)

 //
 // MIPS:typedef signed char int8_t;
 // MIPS:typedef unsigned char uint8_t;
 // MIPS:typedef int8_t int_least8_t;
 // MIPS:typedef uint8_t uint_least8_t;
 // MIPS:typedef int8_t int_fast8_t;
 // MIPS:typedef uint8_t uint_fast8_t;
 //
-// MIPS:typedef int32_t intptr_t;
-// MIPS:typedef uint32_t uintptr_t;
+// MIPS:typedef long int intptr_t;
+// MIPS:typedef long unsigned int uintptr_t;
 //
 // MIPS:typedef long long int intmax_t;
 // MIPS:typedef long long unsigned int uintmax_t;
 //
 // MIPS:INT8_MAX_ 127
 // MIPS:INT8_MIN_ (-127 -1)
 // MIPS:UINT8_MAX_ 255
 // MIPS:INT_LEAST8_MIN_ (-127 -1)

 // MIPS:UINT64_MAX_ 18446744073709551615ULL
 // MIPS:INT_LEAST64_MIN_ (-9223372036854775807LL -1)
 // MIPS:INT_LEAST64_MAX_ 9223372036854775807LL
 // MIPS:UINT_LEAST64_MAX_ 18446744073709551615ULL
 // MIPS:INT_FAST64_MIN_ (-9223372036854775807LL -1)
 // MIPS:INT_FAST64_MAX_ 9223372036854775807LL
 // MIPS:UINT_FAST64_MAX_ 18446744073709551615ULL
 //
-// MIPS:INTPTR_MIN_ (-2147483647 -1)
-// MIPS:INTPTR_MAX_ 2147483647
-// MIPS:UINTPTR_MAX_ 4294967295U
+// MIPS:INTPTR_MIN_ (-2147483647L -1)
+// MIPS:INTPTR_MAX_ 2147483647L
+// MIPS:UINTPTR_MAX_ 4294967295UL
 // MIPS:PTRDIFF_MIN_ (-2147483647 -1)
 // MIPS:PTRDIFF_MAX_ 2147483647
 // MIPS:SIZE_MAX_ 4294967295U
 //
 // MIPS:INTMAX_MIN_ (-9223372036854775807LL -1)
 // MIPS:INTMAX_MAX_ 9223372036854775807LL
 // MIPS:UINTMAX_MAX_ 18446744073709551615ULL
 //

 //
 // MIPS64:typedef signed char int8_t;
 // MIPS64:typedef unsigned char uint8_t;
 // MIPS64:typedef int8_t int_least8_t;
 // MIPS64:typedef uint8_t uint_least8_t;
 // MIPS64:typedef int8_t int_fast8_t;
 // MIPS64:typedef uint8_t uint_fast8_t;
 //
-// MIPS64:typedef int64_t intptr_t;
-// MIPS64:typedef uint64_t uintptr_t;
+// MIPS64:typedef long int intptr_t;
+// MIPS64:typedef long unsigned int uintptr_t;
 //
 // MIPS64:typedef long int intmax_t;
 // MIPS64:typedef long unsigned int uintmax_t;
 //
 // MIPS64:INT8_MAX_ 127
 // MIPS64:INT8_MIN_ (-127 -1)
 // MIPS64:UINT8_MAX_ 255
 // MIPS64:INT_LEAST8_MIN_ (-127 -1)

 //
 // 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 int16_t intptr_t;
-// MSP430:typedef uint16_t uintptr_t;
+// MSP430:typedef int intptr_t;
+// MSP430:typedef unsigned int uintptr_t;
 //
 // MSP430:typedef long long int intmax_t;
 // MSP430:typedef long long unsigned int uintmax_t;
 //
 // MSP430:INT8_MAX_ 127
 // MSP430:INT8_MIN_ (-127 -1)
 // MSP430:UINT8_MAX_ 255
 // MSP430:INT_LEAST8_MIN_ (-127 -1)

 //
 // 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 int64_t intptr_t;
-// PPC64:typedef uint64_t uintptr_t;
+// PPC64:typedef long int intptr_t;
+// PPC64:typedef long unsigned int uintptr_t;
 //
 // PPC64:typedef long int intmax_t;
 // PPC64:typedef long unsigned int uintmax_t;
 //
 // PPC64:INT8_MAX_ 127
 // PPC64:INT8_MIN_ (-127 -1)
 // PPC64:UINT8_MAX_ 255
 // PPC64:INT_LEAST8_MIN_ (-127 -1)

 //
 // PPC64-NETBSD:typedef signed char int8_t;
 // PPC64-NETBSD:typedef unsigned char uint8_t;
 // PPC64-NETBSD:typedef int8_t int_least8_t;
 // PPC64-NETBSD:typedef uint8_t uint_least8_t;
 // PPC64-NETBSD:typedef int8_t int_fast8_t;
 // PPC64-NETBSD:typedef uint8_t uint_fast8_t;
 //
-// PPC64-NETBSD:typedef int64_t intptr_t;
-// PPC64-NETBSD:typedef uint64_t uintptr_t;
+// PPC64-NETBSD:typedef long int intptr_t;
+// PPC64-NETBSD:typedef long unsigned int uintptr_t;
 //
 // PPC64-NETBSD:typedef long long int intmax_t;
 // PPC64-NETBSD:typedef long long unsigned int uintmax_t;
 //
 // PPC64-NETBSD:INT8_MAX_ 127
 // PPC64-NETBSD:INT8_MIN_ (-127 -1)
 // PPC64-NETBSD:UINT8_MAX_ 255
 // PPC64-NETBSD:INT_LEAST8_MIN_ (-127 -1)

 // PPC64-NETBSD:UINT64_MAX_ 18446744073709551615ULL
 // PPC64-NETBSD:INT_LEAST64_MIN_ (-9223372036854775807LL -1)
 // PPC64-NETBSD:INT_LEAST64_MAX_ 9223372036854775807LL
 // PPC64-NETBSD:UINT_LEAST64_MAX_ 18446744073709551615ULL
 // PPC64-NETBSD:INT_FAST64_MIN_ (-9223372036854775807LL -1)
 // PPC64-NETBSD:INT_FAST64_MAX_ 9223372036854775807LL
 // PPC64-NETBSD:UINT_FAST64_MAX_ 18446744073709551615ULL
 //
-// PPC64-NETBSD:INTPTR_MIN_ (-9223372036854775807LL -1)
-// PPC64-NETBSD:INTPTR_MAX_ 9223372036854775807LL
-// PPC64-NETBSD:UINTPTR_MAX_ 18446744073709551615ULL
-// PPC64-NETBSD:PTRDIFF_MIN_ (-9223372036854775807LL -1)
-// PPC64-NETBSD:PTRDIFF_MAX_ 9223372036854775807LL
-// PPC64-NETBSD:SIZE_MAX_ 18446744073709551615ULL
+// PPC64-NETBSD:INTPTR_MIN_ (-9223372036854775807L -1)
+// PPC64-NETBSD:INTPTR_MAX_ 9223372036854775807L
+// PPC64-NETBSD:UINTPTR_MAX_ 18446744073709551615UL
+// PPC64-NETBSD:PTRDIFF_MIN_ (-9223372036854775807L -1)
+// PPC64-NETBSD:PTRDIFF_MAX_ 9223372036854775807L
+// PPC64-NETBSD:SIZE_MAX_ 18446744073709551615UL
 //
 // PPC64-NETBSD:INTMAX_MIN_ (-9223372036854775807LL -1)
 // PPC64-NETBSD:INTMAX_MAX_ 9223372036854775807LL
 // PPC64-NETBSD:UINTMAX_MAX_ 18446744073709551615ULL
 //
 // PPC64-NETBSD:SIG_ATOMIC_MIN_ (-2147483647 -1)
 // PPC64-NETBSD:SIG_ATOMIC_MAX_ 2147483647
 // PPC64-NETBSD:WINT_MIN_ (-2147483647 -1)

 //
 // 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 int32_t intptr_t;
-// PPC:typedef uint32_t uintptr_t;
+// PPC:typedef long int intptr_t;
+// PPC:typedef long unsigned int uintptr_t;
 //
 // PPC:typedef long long int intmax_t;
 // PPC:typedef long long unsigned int uintmax_t;
 //
 // PPC:INT8_MAX_ 127
 // PPC:INT8_MIN_ (-127 -1)
 // PPC:UINT8_MAX_ 255
 // PPC:INT_LEAST8_MIN_ (-127 -1)

 // PPC:UINT64_MAX_ 18446744073709551615ULL
 // PPC:INT_LEAST64_MIN_ (-9223372036854775807LL -1)
 // PPC:INT_LEAST64_MAX_ 9223372036854775807LL
 // PPC:UINT_LEAST64_MAX_ 18446744073709551615ULL
 // PPC:INT_FAST64_MIN_ (-9223372036854775807LL -1)
 // PPC:INT_FAST64_MAX_ 9223372036854775807LL
 // PPC:UINT_FAST64_MAX_ 18446744073709551615ULL
 //
-// PPC:INTPTR_MIN_ (-2147483647 -1)
-// PPC:INTPTR_MAX_ 2147483647
-// PPC:UINTPTR_MAX_ 4294967295U
-// PPC:PTRDIFF_MIN_ (-2147483647 -1)
-// PPC:PTRDIFF_MAX_ 2147483647
-// PPC:SIZE_MAX_ 4294967295U
+// PPC:INTPTR_MIN_ (-2147483647L -1)
+// PPC:INTPTR_MAX_ 2147483647L
+// PPC:UINTPTR_MAX_ 4294967295UL
+// PPC:PTRDIFF_MIN_ (-2147483647L -1)
+// PPC:PTRDIFF_MAX_ 2147483647L
+// PPC:SIZE_MAX_ 4294967295UL
 //
 // PPC:INTMAX_MIN_ (-9223372036854775807LL -1)
 // PPC:INTMAX_MAX_ 9223372036854775807LL
 // PPC:UINTMAX_MAX_ 18446744073709551615ULL
 //
 // PPC:SIG_ATOMIC_MIN_ (-2147483647 -1)
 // PPC:SIG_ATOMIC_MAX_ 2147483647
 // PPC:WINT_MIN_ (-2147483647 -1)

 //
 // 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 int64_t intptr_t;
-// S390X:typedef uint64_t uintptr_t;
+// S390X:typedef long int intptr_t;
+// S390X:typedef long unsigned int uintptr_t;
 //
 // S390X:typedef long int intmax_t;
 // S390X:typedef long unsigned int uintmax_t;
 //
 // S390X:INT8_MAX_ 127
 // S390X:INT8_MIN_ (-127 -1)
 // S390X:UINT8_MAX_ 255
 // S390X:INT_LEAST8_MIN_ (-127 -1)

 //
 // 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 int32_t intptr_t;
-// SPARC:typedef uint32_t uintptr_t;
+// SPARC:typedef int intptr_t;
+// SPARC:typedef unsigned int uintptr_t;
 //
 // SPARC:typedef long long int intmax_t;
 // SPARC:typedef long long unsigned int uintmax_t;
 //
 // SPARC:INT8_MAX_ 127
 // SPARC:INT8_MIN_ (-127 -1)
 // SPARC:UINT8_MAX_ 255
 // SPARC:INT_LEAST8_MIN_ (-127 -1)

 //
 // 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 int32_t intptr_t;
-// TCE:typedef uint32_t uintptr_t;
+// TCE:typedef int intptr_t;
+// TCE:typedef unsigned int uintptr_t;
 //
 // TCE:typedef long int intmax_t;
 // TCE:typedef long unsigned int uintmax_t;
 //
 // TCE:INT8_MAX_ 127
 // TCE:INT8_MIN_ (-127 -1)
 // TCE:UINT8_MAX_ 255
 // TCE:INT_LEAST8_MIN_ (-127 -1)

 //
 // TCE:INTPTR_MIN_ (-2147483647 -1)
 // TCE:INTPTR_MAX_ 2147483647
 // TCE:UINTPTR_MAX_ 4294967295U
 // TCE:PTRDIFF_MIN_ (-2147483647 -1)
 // TCE:PTRDIFF_MAX_ 2147483647
 // TCE:SIZE_MAX_ 4294967295U
 //
-// TCE:INTMAX_MIN_ (-2147483647 -1)
-// TCE:INTMAX_MAX_ 2147483647
-// TCE:UINTMAX_MAX_ 4294967295U
+// TCE:INTMAX_MIN_ (-2147483647L -1)
+// TCE:INTMAX_MAX_ 2147483647L
+// TCE:UINTMAX_MAX_ 4294967295UL
 //
 // TCE:SIG_ATOMIC_MIN_ (-2147483647 -1)
 // TCE:SIG_ATOMIC_MAX_ 2147483647
 // TCE:WINT_MIN_ (-2147483647 -1)
 // TCE:WINT_MAX_ 2147483647
 //
 // TCE:WCHAR_MAX_ 2147483647
 // TCE:WCHAR_MIN_ (-2147483647 -1)

 //
 // 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 int64_t intptr_t;
-// X86_64:typedef uint64_t uintptr_t;
+// X86_64:typedef long int intptr_t;
+// X86_64:typedef long unsigned int uintptr_t;
 //
 // X86_64:typedef long int intmax_t;
 // X86_64:typedef long unsigned int uintmax_t;
 //
 // X86_64:INT8_MAX_ 127
 // X86_64:INT8_MIN_ (-127 -1)
 // X86_64:UINT8_MAX_ 255
 // X86_64:INT_LEAST8_MIN_ (-127 -1)

 //
 // XCORE:typedef signed char int8_t;
 // XCORE:typedef unsigned char uint8_t;
 // XCORE:typedef int8_t int_least8_t;
 // XCORE:typedef uint8_t uint_least8_t;
 // XCORE:typedef int8_t int_fast8_t;
 // XCORE:typedef uint8_t uint_fast8_t;
 //
-// XCORE:typedef int32_t intptr_t;
-// XCORE:typedef uint32_t uintptr_t;
+// XCORE:typedef int intptr_t;
+// XCORE:typedef unsigned int uintptr_t;
 //
 // XCORE:typedef long long int intmax_t;
 // XCORE:typedef long long unsigned int uintmax_t;
 //
 // XCORE:INT8_MAX_ 127
 // XCORE:INT8_MIN_ (-127 -1)
 // XCORE:UINT8_MAX_ 255
 // XCORE:INT_LEAST8_MIN_ (-127 -1)

 //
 //
 // stdint.h forms several macro definitions by pasting together identifiers
 // to form names (eg. int32_t is formed from int ## 32 ## _t). The following 
 // case tests that these joining operations are performed correctly even if
 // the identifiers used in the operations (int, uint, _t, INT, UINT, _MIN,
 // _MAX, and _C(v)) are themselves macros.
 //
-// RUN: %clang_cc1 -E -ffreestanding -U__UINTMAX_TYPE__ -U__INTMAX_TYPE__ -Dint=a -Duint=b -D_t=c -DINT=d -DUINT=e -D_MIN=f -D_MAX=g '-D_C(v)=h' -triple=i386-none-none %s | FileCheck -check-prefix JOIN %s
-// JOIN:typedef int32_t intptr_t;
-// JOIN:typedef uint32_t uintptr_t;
+// RUN: %clang_cc1 -E -ffreestanding                                 \
+// RUN:   -U__UINTPTR_TYPE__ -U__INTPTR_TYPE__                       \
+// RUN:   -U__UINTMAX_TYPE__ -U__INTMAX_TYPE__                       \
+// RUN:   -Dint=a -Duint=b -D_t=c -DINT=d -DUINT=e -D_MIN=f -D_MAX=g \
+// RUN:   '-D_C(v)=h' -triple=i386-none-none %s                      \
+// RUN: | FileCheck -check-prefix JOIN %s
+// JOIN:typedef __INTPTR_TYPE__ intptr_t;
+// JOIN:typedef __UINTPTR_TYPE__ uintptr_t;
 // JOIN:typedef __INTMAX_TYPE__ intmax_t;
 // JOIN:typedef __UINTMAX_TYPE__ uintmax_t;
 // JOIN:INTPTR_MIN_ (-2147483647 -1)
 // JOIN:INTPTR_MAX_ 2147483647
 // JOIN:UINTPTR_MAX_ 4294967295U
 // JOIN:PTRDIFF_MIN_ (-2147483647 -1)
 // JOIN:PTRDIFF_MAX_ 2147483647
 // JOIN:SIZE_MAX_ 4294967295U
 // JOIN:INTMAX_MIN_ (-9223372036854775807LL -1)
 // JOIN:INTMAX_MAX_ 9223372036854775807LL
 // JOIN:UINTMAX_MAX_ 18446744073709551615ULL
 // JOIN:SIG_ATOMIC_MIN_ (-2147483647 -1)
 // JOIN:SIG_ATOMIC_MAX_ 2147483647
 // JOIN:WINT_MIN_ (-2147483647 -1)
 // JOIN:WINT_MAX_ 2147483647
 // JOIN:WCHAR_MAX_ 2147483647