X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fcompiler.h;h=47c296e202d1e97388d3207e4f0c2321831a2f87;hb=0bfcc924552b8ec79a20b8b12557ff08742c4f0e;hp=91dbe56994c240c42be04b9d9e848e0e7a1f33c5;hpb=6ca803750e1e08fce26e508f1c35170bf9259bb4;p=karo-tx-uboot.git diff --git a/include/compiler.h b/include/compiler.h index 91dbe56994..47c296e202 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -44,10 +44,15 @@ #ifdef __linux__ # include # include -#elif defined(__MACH__) +#elif defined(__MACH__) || defined(__FreeBSD__) # 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)