diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2019-09-11 13:25:17 +0000 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2019-09-12 06:07:18 +0000 |
| commit | 6f677d6848fb8a149de69b48298692c6422f976e (patch) | |
| tree | d14ed5d9112fc5792cc803184d2231ebad82190d /tools/mkimage | |
| parent | c5ed9f43446995d283fdd67acb24bbc2b3c47198 (diff) | |
| download | upstream-6f677d6848fb8a149de69b48298692c6422f976e.tar.gz upstream-6f677d6848fb8a149de69b48298692c6422f976e.tar.bz2 upstream-6f677d6848fb8a149de69b48298692c6422f976e.zip | |
tools: mkimage: fix __u64 typedef conflict with new glibc
Including "sys/stat.h" from newer glibc will cause __u64 from linux uapi
header to be included, causing compilation failure for u-boot tools
USE_HOSTCC
Remove typedef for __u64 in include/compiler.h to fix the issue. It should be
safe because as of u-boot-2018.03, no ref to __u64 is found under u-boot tools/
directory
Error message snippet follows
HOSTCC tools/mkenvimage.o
In file included from /usr/include/asm-generic/types.h:7,
from /usr/include/asm/types.h:5,
from /usr/include/linux/types.h:5,
from /usr/include/linux/stat.h:5,
from /usr/include/bits/statx.h:30,
from /usr/include/sys/stat.h:446,
from tools/mkenvimage.c:21:
/usr/include/asm-generic/int-ll64.h:31:42: error: conflicting types for '__u64'
31 | __extension__ typedef unsigned long long __u64;
| ^~~~~
In file included from <command-line>:
././include/compiler.h:69:18: note: previous declaration of '__u64' was here
69 | typedef uint64_t __u64;
| ^~~~~
make[5]: *** [scripts/Makefile.host:116: tools/mkenvimage.o] Error 1
Ref: https://forum.openwrt.org/t/compile-error-19-07/44423
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1699194
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'tools/mkimage')
| -rw-r--r-- | tools/mkimage/patches/060-remove_kernel_includes.patch | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/mkimage/patches/060-remove_kernel_includes.patch b/tools/mkimage/patches/060-remove_kernel_includes.patch index e61d8cc496..0d69b99214 100644 --- a/tools/mkimage/patches/060-remove_kernel_includes.patch +++ b/tools/mkimage/patches/060-remove_kernel_includes.patch @@ -1,10 +1,9 @@ --- a/include/compiler.h +++ b/include/compiler.h -@@ -66,6 +66,11 @@ typedef uint8_t __u8; +@@ -66,6 +66,10 @@ typedef uint8_t __u8; typedef uint16_t __u16; typedef uint32_t __u32; typedef unsigned int uint; -+typedef uint64_t __u64; +#ifndef linux +typedef int __kernel_daddr_t; +typedef unsigned int __kernel_ino_t; |