Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: mkimage: fix __u64 typedef conflict with new glibc #32

Open
wants to merge 1 commit into
base: openwrt-18.06
Choose a base branch
from

Commits on Oct 21, 2021

  1. 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 <[email protected]>
    yousong authored and LinusU committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    ad099bb View commit details
    Browse the repository at this point in the history