5 files changed, 46 insertions, 2 deletions
diff --git a/newlib/libc/include/grp.h b/newlib/libc/include/grp.h
index 1273e3959..c3a5a676c 100644
--- a/newlib/libc/include/grp.h
+++ b/newlib/libc/include/grp.h
@@ -43,6 +43,7 @@
 #ifndef _GRP_H_
 #define	_GRP_H_
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 #ifdef __CYGWIN__
 #include <cygwin/grp.h>
diff --git a/newlib/libc/include/machine/_default_types.h b/newlib/libc/include/machine/_default_types.h
index 2bd5f64a0..ffc646d9e 100644
--- a/newlib/libc/include/machine/_default_types.h
+++ b/newlib/libc/include/machine/_default_types.h
@@ -25,7 +25,11 @@ extern "C" {
 
 #ifdef __INT8_TYPE__
 typedef __INT8_TYPE__ __int8_t;
+#ifdef __UINT8_TYPE__
 typedef __UINT8_TYPE__ __uint8_t;
+#else
+typedef unsigned __INT8_TYPE__ __uint8_t;
+#endif
 #define ___int8_t_defined 1
 #elif __EXP(SCHAR_MAX) == 0x7f
 typedef signed char __int8_t ;
@@ -35,7 +39,11 @@ typedef unsigned char __uint8_t ;
 
 #ifdef __INT16_TYPE__
 typedef __INT16_TYPE__ __int16_t;
+#ifdef __UINT16_TYPE__
 typedef __UINT16_TYPE__ __uint16_t;
+#else
+typedef unsigned __INT16_TYPE__ __uint16_t;
+#endif
 #define ___int16_t_defined 1
 #elif __EXP(INT_MAX) == 0x7fff
 typedef signed int __int16_t;
@@ -53,7 +61,11 @@ typedef unsigned char __uint16_t;
 
 #ifdef __INT32_TYPE__
 typedef __INT32_TYPE__ __int32_t;
+#ifdef __UINT32_TYPE__
 typedef __UINT32_TYPE__ __uint32_t;
+#else
+typedef unsigned __INT32_TYPE__ __uint32_t;
+#endif
 #define ___int32_t_defined 1
 #elif __EXP(INT_MAX) == 0x7fffffffL
 typedef signed int __int32_t;
@@ -75,7 +87,11 @@ typedef unsigned char __uint32_t;
 
 #ifdef __INT64_TYPE__
 typedef __INT64_TYPE__ __int64_t;
+#ifdef __UINT64_TYPE__
 typedef __UINT64_TYPE__ __uint64_t;
+#else
+typedef unsigned __INT64_TYPE__ __uint64_t;
+#endif
 #define ___int64_t_defined 1
 #elif __EXP(LONG_MAX) > 0x7fffffff
 typedef signed long __int64_t;
@@ -102,7 +118,11 @@ typedef unsigned int __uint64_t;
 
 #ifdef __INT_LEAST8_TYPE__
 typedef __INT_LEAST8_TYPE__ __int_least8_t;
+#ifdef __UINT_LEAST8_TYPE__
 typedef __UINT_LEAST8_TYPE__ __uint_least8_t;
+#else
+typedef unsigned __INT_LEAST8_TYPE__ __uint_least8_t;
+#endif
 #define ___int_least8_t_defined 1
 #elif defined(___int8_t_defined)
 typedef __int8_t __int_least8_t;
@@ -124,7 +144,11 @@ typedef __uint64_t __uint_least8_t;
 
 #ifdef __INT_LEAST16_TYPE__
 typedef __INT_LEAST16_TYPE__ __int_least16_t;
+#ifdef __UINT_LEAST16_TYPE__
 typedef __UINT_LEAST16_TYPE__ __uint_least16_t;
+#else
+typedef unsigned __INT_LEAST16_TYPE__ __uint_least16_t;
+#endif
 #define ___int_least16_t_defined 1
 #elif defined(___int16_t_defined)
 typedef __int16_t __int_least16_t;
@@ -142,7 +166,11 @@ typedef __uint64_t __uint_least16_t;
 
 #ifdef __INT_LEAST32_TYPE__
 typedef __INT_LEAST32_TYPE__ __int_least32_t;
+#ifdef __UINT_LEAST32_TYPE__
 typedef __UINT_LEAST32_TYPE__ __uint_least32_t;
+#else
+typedef unsigned __INT_LEAST32_TYPE__ __uint_least32_t;
+#endif
 #define ___int_least32_t_defined 1
 #elif defined(___int32_t_defined)
 typedef __int32_t __int_least32_t;
@@ -156,7 +184,11 @@ typedef __uint64_t __uint_least32_t;
 
 #ifdef __INT_LEAST64_TYPE__
 typedef __INT_LEAST64_TYPE__ __int_least64_t;
+#ifdef __UINT_LEAST64_TYPE__
 typedef __UINT_LEAST64_TYPE__ __uint_least64_t;
+#else
+typedef unsigned __INT_LEAST64_TYPE__ __uint_least64_t;
+#endif
 #define ___int_least64_t_defined 1
 #elif defined(___int64_t_defined)
 typedef __int64_t __int_least64_t;
@@ -166,7 +198,11 @@ typedef __uint64_t __uint_least64_t;
 
 #ifdef __INTPTR_TYPE__
 typedef __INTPTR_TYPE__ __intptr_t;
+#ifdef __UINTPTR_TYPE__
 typedef __UINTPTR_TYPE__ __uintptr_t;
+#else
+typedef unsigned __INTPTR_TYPE__ __uintptr_t;
+#endif
 #elif defined(__PTRDIFF_TYPE__)
 typedef __PTRDIFF_TYPE__ __intptr_t;
 typedef unsigned __PTRDIFF_TYPE__ __uintptr_t;
diff --git a/newlib/libc/include/pwd.h b/newlib/libc/include/pwd.h
index d849f5fe4..3dea4ee2d 100644
--- a/newlib/libc/include/pwd.h
+++ b/newlib/libc/include/pwd.h
@@ -39,6 +39,7 @@ extern "C" {
 #endif
 #define	_PWD_H_
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #if __BSD_VISIBLE
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index ef218663b..905cf5d59 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -231,11 +231,11 @@ int	_EXFUN(_system_r,(struct _reent *, const char *));
 _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
 
 /* On platforms where long double equals double.  */
-#ifdef _LDBL_EQ_DBL
+#ifdef _HAVE_LONG_DOUBLE
 #if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L)
 extern long double strtold (const char *__restrict, char **__restrict);
 #endif
-#endif /* _LDBL_EQ_DBL */
+#endif /* _HAVE_LONG_DOUBLE */
 
 _END_STD_C
 
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index b91b03920..d7b6612db 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -39,6 +39,12 @@ struct tm
   int	tm_wday;
   int	tm_yday;
   int	tm_isdst;
+#ifdef __TM_GMTOFF
+  long	__TM_GMTOFF;
+#endif
+#ifdef __TM_ZONE
+  const char *__TM_ZONE;
+#endif
 };
 
 clock_t	   _EXFUN(clock,    (void));