2008-12-10 Joseph Myers <joseph@codesourcery.com>

        * libc/include/stdint.h (INT32_MIN, INT32_MAX, UINT32_MAX,
        INT_LEAST32_MIN, INT_LEAST32_MAX, UINT_LEAST32_MAX): Define to
        constants with "long" types where appropriate.
        (INT_FAST8_MIN, INT_FAST8_MAX, UINT_FAST8_MAX, INT_FAST16_MIN,
        INT_FAST16_MAX, UINT_FAST16_MAX, INT_FAST32_MIN, INT_FAST32_MAX,
        UINT_FAST32_MAX, INT_FAST64_MIN, INT_FAST64_MAX, UINT_FAST64_MAX):
        Correct to match logic for defining corresponding types.
        (INTMAX_MAX, INTMAX_MIN, UINTMAX_MAX): Define.
        (SIZE_MAX): Define using __SIZE_MAX__ if available.
        (PTRDIFF_MAX): Define using __PTRDIFF_MAX__ if available.
        (PTRDIFF_MIN): Define in terms of PTRDIFF_MAX.
        (WCHAR_MAX, WCHAR_MIN, WINT_MAX, WINT_MIN): Define.
        (UINT8_C, UINT16_C): Define to give signed values if corresponding
        types would promote to int.

2 files changed, 117 insertions, 17 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 5753490..2e3c94c 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,20 @@
+2008-12-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* libc/include/stdint.h (INT32_MIN, INT32_MAX, UINT32_MAX,
+	INT_LEAST32_MIN, INT_LEAST32_MAX, UINT_LEAST32_MAX): Define to
+	constants with "long" types where appropriate.
+	(INT_FAST8_MIN, INT_FAST8_MAX, UINT_FAST8_MAX, INT_FAST16_MIN,
+	INT_FAST16_MAX, UINT_FAST16_MAX, INT_FAST32_MIN, INT_FAST32_MAX,
+	UINT_FAST32_MAX, INT_FAST64_MIN, INT_FAST64_MAX, UINT_FAST64_MAX):
+	Correct to match logic for defining corresponding types.
+	(INTMAX_MAX, INTMAX_MIN, UINTMAX_MAX): Define.
+	(SIZE_MAX): Define using __SIZE_MAX__ if available.
+	(PTRDIFF_MAX): Define using __PTRDIFF_MAX__ if available.
+	(PTRDIFF_MIN): Define in terms of PTRDIFF_MAX.
+	(WCHAR_MAX, WCHAR_MIN, WINT_MAX, WINT_MIN): Define.
+	(UINT8_C, UINT16_C): Define to give signed values if corresponding
+	types would promote to int.
+
 2008-12-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/include/sys/features.h (_POSIX_V6_ILP32_OFF32): Always define.
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
index 821462d..671400b 100644
--- a/newlib/libc/include/stdint.h
+++ b/newlib/libc/include/stdint.h
@@ -6,10 +6,6 @@
  * is freely granted, provided that this notice is preserved.
  */
 
-/*
- * @todo - Add support for wint_t types.
- */
-
 #ifndef _STDINT_H
 #define _STDINT_H
 
@@ -286,15 +282,27 @@ typedef unsigned long uintptr_t;
 #endif
 
 #if __int32_t_defined
+#if __have_long32
+#define INT32_MIN 	 (-2147483647L-1)
+#define INT32_MAX 	 2147483647L
+#define UINT32_MAX       4294967295UL
+#else
 #define INT32_MIN 	 (-2147483647-1)
 #define INT32_MAX 	 2147483647
 #define UINT32_MAX       4294967295U
 #endif
+#endif
 
 #if __int_least32_t_defined
+#if __have_long32
+#define INT_LEAST32_MIN  (-2147483647L-1)
+#define INT_LEAST32_MAX  2147483647L
+#define UINT_LEAST32_MAX 4294967295UL
+#else
 #define INT_LEAST32_MIN  (-2147483647-1)
 #define INT_LEAST32_MAX  2147483647
 #define UINT_LEAST32_MAX 4294967295U
+#endif
 #else
 #error required type int_least32_t missing
 #endif
@@ -324,46 +332,121 @@ typedef unsigned long uintptr_t;
 #endif
 
 #if __int_fast8_t_defined
-#define INT_FAST8_MIN	INT8_MIN
-#define INT_FAST8_MAX	INT8_MAX
-#define UINT_FAST8_MAX	UINT8_MAX
+#if __STDINT_EXP(INT_MAX) >= 0x7f
+#define INT_FAST8_MIN	(-__STDINT_EXP(INT_MAX)-1)
+#define INT_FAST8_MAX	__STDINT_EXP(INT_MAX)
+#define UINT_FAST8_MAX	(__STDINT_EXP(INT_MAX)*2U+1U)
+#else
+#define INT_FAST8_MIN	INT_LEAST8_MIN
+#define INT_FAST8_MAX	INT_LEAST8_MAX
+#define UINT_FAST8_MAX	UINT_LEAST8_MAX
+#endif
 #endif
 
 #if __int_fast16_t_defined
-#define INT_FAST16_MIN	INT16_MIN
-#define INT_FAST16_MAX	INT16_MAX
-#define UINT_FAST16_MAX	UINT16_MAX
+#if __STDINT_EXP(INT_MAX) >= 0x7fff
+#define INT_FAST16_MIN	(-__STDINT_EXP(INT_MAX)-1)
+#define INT_FAST16_MAX	__STDINT_EXP(INT_MAX)
+#define UINT_FAST16_MAX	(__STDINT_EXP(INT_MAX)*2U+1U)
+#else
+#define INT_FAST16_MIN	INT_LEAST16_MIN
+#define INT_FAST16_MAX	INT_LEAST16_MAX
+#define UINT_FAST16_MAX	UINT_LEAST16_MAX
+#endif
 #endif
 
 #if __int_fast32_t_defined
-#define INT_FAST32_MIN	INT32_MIN
-#define INT_FAST32_MAX	INT32_MAX
-#define UINT_FAST32_MAX	UINT32_MAX
+#if __STDINT_EXP(INT_MAX) >= 0x7fffffff
+#define INT_FAST32_MIN	(-__STDINT_EXP(INT_MAX)-1)
+#define INT_FAST32_MAX	__STDINT_EXP(INT_MAX)
+#define UINT_FAST32_MAX	(__STDINT_EXP(INT_MAX)*2U+1U)
+#else
+#define INT_FAST32_MIN	INT_LEAST32_MIN
+#define INT_FAST32_MAX	INT_LEAST32_MAX
+#define UINT_FAST32_MAX	UINT_LEAST32_MAX
+#endif
 #endif
 
 #if __int_fast64_t_defined
-#define INT_FAST64_MIN	INT64_MIN
-#define INT_FAST64_MAX	INT64_MAX
-#define UINT_FAST64_MAX	UINT64_MAX
+#if __STDINT_EXP(INT_MAX) > 0x7fffffff
+#define INT_FAST64_MIN	(-__STDINT_EXP(INT_MAX)-1)
+#define INT_FAST64_MAX	__STDINT_EXP(INT_MAX)
+#define UINT_FAST64_MAX	(__STDINT_EXP(INT_MAX)*2U+1U)
+#else
+#define INT_FAST64_MIN	INT_LEAST64_MIN
+#define INT_FAST64_MAX	INT_LEAST64_MAX
+#define UINT_FAST64_MAX	UINT_LEAST64_MAX
+#endif
+#endif
+
+#ifdef __INTMAX_MAX__
+#define INTMAX_MAX __INTMAX_MAX__
+#define INTMAX_MIN (-INTMAX_MAX - 1)
+#elif defined(__INTMAX_TYPE__)
+/* All relevant GCC versions prefer long to long long for intmax_t.  */
+#define INTMAX_MAX INT64_MAX
+#define INTMAX_MIN INT64_MIN
+#endif
+
+#ifdef __UINTMAX_MAX__
+#define UINTMAX_MAX __UINTMAX_MAX__
+#elif defined(__UINTMAX_TYPE__)
+/* All relevant GCC versions prefer long to long long for intmax_t.  */
+#define UINTMAX_MAX UINT64_MAX
 #endif
 
 /* This must match size_t in stddef.h, currently long unsigned int */
+#ifdef __SIZE_MAX__
+#define SIZE_MAX __SIZE_MAX__
+#else
 #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
+#endif
 
 /* This must match sig_atomic_t in <signal.h> (currently int) */
 #define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1)
 #define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX)
 
 /* This must match ptrdiff_t  in <stddef.h> (currently long int) */
-#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
+#ifdef __PTRDIFF_MAX__
+#define PTRDIFF_MAX __PTRDIFF_MAX__
+#else
 #define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)
+#endif
+#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)
+
+#ifdef __WCHAR_MAX__
+#define WCHAR_MAX __WCHAR_MAX__
+#endif
+#ifdef __WCHAR_MIN__
+#define WCHAR_MIN __WCHAR_MIN__
+#endif
+
+/* wint_t is unsigned int on almost all GCC targets.  */
+#ifdef __WINT_MAX__
+#define WINT_MAX __WINT_MAX__
+#else
+#define WINT_MAX (__STDINT_EXP(INT_MAX) * 2U + 1U)
+#endif
+#ifdef __WINT_MIN__
+#define WINT_MIN __WINT_MIN__
+#else
+#define WINT_MIN 0U
+#endif
 
 /** Macros for minimum-width integer constant expressions */
 #define INT8_C(x)	x
+#if __STDINT_EXP(INT_MAX) > 0x7f
+#define UINT8_C(x)	x
+#else
 #define UINT8_C(x)	x##U
+#endif
 
 #define INT16_C(x)	x
+#if __STDINT_EXP(INT_MAX) > 0x7fff
+#define UINT16_C(x)	x
+#else
 #define UINT16_C(x)	x##U
+#endif
 
 #if __have_long32
 #define INT32_C(x)	x##L