diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-06 20:47:38 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-10 20:48:16 -0400 |
| commit | 9865543ae65d7c9a435eedfc6a0ba23efb291121 (patch) | |
| tree | 30e56d39a99e2bd49237472f4545e249704764f2 /include | |
| parent | de39dc71625d1a66cc611d1a85bf53545cba60a3 (diff) | |
| download | u-boot-9865543ae65d7c9a435eedfc6a0ba23efb291121.zip u-boot-9865543ae65d7c9a435eedfc6a0ba23efb291121.tar.gz u-boot-9865543ae65d7c9a435eedfc6a0ba23efb291121.tar.bz2 | |
Remove CONFIG_USE_STDINT
You do not need to use the typedefs provided by compiler.
Our compilers are either IPL32 or LP64. Hence, U-Boot can/should
always use int-ll64.h typedefs like Linux kernel, whatever the
typedefs the compiler internally uses.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/compiler.h | 5 | ||||
| -rw-r--r-- | include/inttypes.h | 10 | ||||
| -rw-r--r-- | include/linux/types.h | 9 |
3 files changed, 1 insertions, 23 deletions
diff --git a/include/compiler.h b/include/compiler.h index 957f4b5..29507f9 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -120,13 +120,8 @@ typedef unsigned int uint; #else /* !USE_HOSTCC */ -#ifdef CONFIG_USE_STDINT -/* Provided by gcc. */ -#include <stdint.h> -#else /* Type for `void *' pointers. */ typedef unsigned long int uintptr_t; -#endif #include <linux/string.h> #include <linux/types.h> diff --git a/include/inttypes.h b/include/inttypes.h index ea731ec..b86ad04 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -34,19 +34,9 @@ typedef wchar_t __gwchar_t; defined if explicitly requested. */ #if !defined __cplusplus || defined __STDC_FORMAT_MACROS -#ifdef CONFIG_USE_STDINT -# if __WORDSIZE == 64 -# define __PRI64_PREFIX "l" -# define __PRIPTR_PREFIX "l" -# else -# define __PRI64_PREFIX "ll" -# define __PRIPTR_PREFIX -# endif -#else /* linux/types.h always uses long long for 64-bit and long for uintptr_t */ # define __PRI64_PREFIX "ll" # define __PRIPTR_PREFIX "l" -#endif /* Macros for printing format specifiers. */ diff --git a/include/linux/types.h b/include/linux/types.h index 7c33e7a..1f3cd63 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -106,8 +106,7 @@ typedef __u8 uint8_t; typedef __u16 uint16_t; typedef __u32 uint32_t; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && \ - (!defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__)) +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) typedef __u64 uint64_t; typedef __u64 u_int64_t; typedef __s64 int64_t; @@ -120,12 +119,6 @@ typedef __s64 int64_t; #define aligned_be64 __be64 __aligned(8) #define aligned_le64 __le64 __aligned(8) -#if defined(CONFIG_USE_STDINT) && defined(__INT64_TYPE__) -typedef __UINT64_TYPE__ uint64_t; -typedef __UINT64_TYPE__ u_int64_t; -typedef __INT64_TYPE__ int64_t; -#endif - #ifdef __KERNEL__ typedef phys_addr_t resource_size_t; #endif |