Skip to content

Commit eefb8c1

Browse files
tpimhmasahir0y
authored andcommitted
x86/boot: kbuild: allow readelf executable to be specified
Introduce a new READELF variable to top-level Makefile, so the name of readelf binary can be specified. Before this change the name of the binary was hardcoded to "$(CROSS_COMPILE)readelf" which might not be present for every toolchain. This allows to build with LLVM Object Reader by using make parameter READELF=llvm-readelf. Link: ClangBuiltLinux#771 Signed-off-by: Dmitry Golovin <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent cf6b58a commit eefb8c1

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ STRIP = $(CROSS_COMPILE)strip
414414
OBJCOPY = $(CROSS_COMPILE)objcopy
415415
OBJDUMP = $(CROSS_COMPILE)objdump
416416
OBJSIZE = $(CROSS_COMPILE)size
417+
READELF = $(CROSS_COMPILE)readelf
417418
PAHOLE = pahole
418419
LEX = flex
419420
YACC = bison
@@ -472,7 +473,7 @@ GCC_PLUGINS_CFLAGS :=
472473
CLANG_FLAGS :=
473474

474475
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
475-
export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE PAHOLE LEX YACC AWK INSTALLKERNEL
476+
export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL
476477
export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
477478
export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
478479

arch/x86/boot/compressed/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o
103103
quiet_cmd_check_data_rel = DATAREL $@
104104
define cmd_check_data_rel
105105
for obj in $(filter %.o,$^); do \
106-
${CROSS_COMPILE}readelf -S $$obj | grep -qF .rel.local && { \
106+
$(READELF) -S $$obj | grep -qF .rel.local && { \
107107
echo "error: $$obj has data relocations!" >&2; \
108108
exit 1; \
109109
} || true; \

0 commit comments

Comments
 (0)