FROMGIT: objtool: Also include tools/include/uapi

When building objtool against a sysroot that contains a stripped down
version of the UAPI headers, the following error happens:

    In file included from arch/x86/decode.c:10:
    In file included from .../tools/arch/x86/include/asm/insn.h:10:
    In file included from <sysroot>/include/asm/byteorder.h:9:
    In file included from <sysroot>/include/linux/byteorder/little_endian.h:15:
    In file included from <sysroot>/include/linux/stddef.h:9:
    In file included from .../tools/include/linux/compiler_types.h:36:
    .../tools/include/linux/compiler-gcc.h:3:2: error: "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
        3 | #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
        |  ^
    1 error generated.

As hinted by the error, this is because <sysroot>/include/linux/stddef.h
(a stripped-down version of uapi/include/linux/stddef.h) includes
linux/compiler_types.h directly. However, this gets resolved to
tools/include/linux/compiler_types.h, which is not expected to be
included directly.

To resolve this, I added tools/include/uapi to the include paths when
building objtool. With this trick, linux/stddef.h is resolved to
tools/include/uapi/linux/stddef.h, which doesn't include
linux/compiler_types.h.

Signed-off-by: HONG Yifan <elsk@google.com>
Bug: 367476741
Link: https://lore.kernel.org/lkml/20241008234718.17127-1-elsk@google.com/T/#m6ce8133909845a002898d2537cc00314c0541bfa
Change-Id: I959909799fb11f7462402138951805003ad0eafc
(cherry picked from commit 5308a61bd3ec34b863a4ec89d3b61cb429ebfac2
 https://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git objtool/core)

This commit is contained in:

HONG Yifan

2024-09-16 17:58:16 -07:00

committed by

Matthias Männich

parent e8e7f1f0ba

commit fe5ccbc9ba

1 changed files with 1 additions and 0 deletions

									
										tools/objtool/Makefile
									
		+1
		
												View File
												
				@@ -24,6 +24,7 @@ LIBELF_LIBS  := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lel

				all: $(OBJTOOL)

				INCLUDES := -I$(srctree)/tools/include \

					    -I$(srctree)/tools/include/uapi \

					    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \

					    -I$(srctree)/tools/arch/$(SRCARCH)/include	\

					    -I$(srctree)/tools/objtool/include \