projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
compiler.h
diff --git
a/include/compiler.h
b/include/compiler.h
index
23f4b83
..
0734ed4
100644
(file)
--- a/
include/compiler.h
+++ b/
include/compiler.h
@@
-44,10
+44,9
@@
#ifdef __linux__
# include <endian.h>
# include <byteswap.h>
#ifdef __linux__
# include <endian.h>
# include <byteswap.h>
-#elif defined(__MACH__)
+#elif defined(__MACH__)
|| defined(__FreeBSD__)
# include <machine/endian.h>
typedef unsigned long ulong;
# include <machine/endian.h>
typedef unsigned long ulong;
-typedef unsigned int uint;
#endif
typedef uint8_t __u8;
#endif
typedef uint8_t __u8;
@@
-112,14
+111,22
@@
typedef unsigned int uint;
#include <linux/types.h>
#include <asm/byteorder.h>
#include <linux/types.h>
#include <asm/byteorder.h>
-/* 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
#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
-#endif
+/* Type for `void *' pointers. */
+typedef unsigned long int uintptr_t;
+
+#endif /* USE_HOSTCC */
/* compiler options */
#define uninitialized_var(x) x = x
/* compiler options */
#define uninitialized_var(x) x = x