X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fcompiler.h;h=47c296e202d1e97388d3207e4f0c2321831a2f87;hb=99d969612f6e46192b4a963a7e5f8466a884f920;hp=4e047c7fd2cd08646a5e5b0bea47bb2dd46666c7;hpb=9023ae305919d0aecb4a22726b9d08c6b08189d7;p=u-boot diff --git a/include/compiler.h b/include/compiler.h index 4e047c7fd2..47c296e202 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -48,6 +48,11 @@ # include typedef unsigned long ulong; #endif +#ifdef __FreeBSD__ +# include /* htole32 and friends */ +#endif + +#include typedef uint8_t __u8; typedef uint16_t __u16; @@ -107,21 +112,31 @@ typedef unsigned int uint; #else /* !USE_HOSTCC */ +#ifdef CONFIG_USE_STDINT +/* Provided by gcc. */ +#include +#else +/* Type for `void *' pointers. */ +typedef unsigned long int uintptr_t; +#endif + #include #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; -#endif - +/* + * 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 -/* compiler options */ -#define uninitialized_var(x) x = x +#endif /* USE_HOSTCC */ #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0)