X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fcompiler.h;h=9afc11be1942d6b9e2c4ba19ed059fd288447685;hb=d0ea61d9caf85e4285d5c2da508db9fac70e4aba;hp=8030bf6ed23bb9b371c2eb5bb289e031a5f23f93;hpb=b050c72d52c4e30d5b978ab6758f8dcdbe5c690c;p=u-boot diff --git a/include/compiler.h b/include/compiler.h index 8030bf6ed2..9afc11be19 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -25,8 +25,6 @@ #include #include -extern int errno; - #if !defined(__WIN32__) && !defined(__MINGW32__) # include #endif @@ -46,11 +44,11 @@ extern int errno; #ifdef __linux__ # include # include -#elif defined(__MACH__) +#elif defined(__MACH__) || defined(__FreeBSD__) # include typedef unsigned long ulong; -typedef unsigned int uint; #endif +#include typedef uint8_t __u8; typedef uint16_t __u16; @@ -114,14 +112,22 @@ typedef unsigned int uint; #include #include -/* Types for `void *' pointers. */ -#if __WORDSIZE == 64 -typedef unsigned long int uintptr_t; +#if __SIZEOF_LONG__ == 8 +# define __WORDSIZE 64 +#elif __SIZEOF_LONG__ == 4 +# define __WORDSIZE 32 #else -typedef unsigned int uintptr_t; +/* + * Assume 32-bit for now - only newer toolchains support this feature and + * this is only required for sandbox support at present. + */ +#define __WORDSIZE 32 #endif -#endif +/* Type for `void *' pointers. */ +typedef unsigned long int uintptr_t; + +#endif /* USE_HOSTCC */ /* compiler options */ #define uninitialized_var(x) x = x