lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 005/107] x86/boot: kbuild: allow readelf executable to be specified
    Date
    From: Dmitry Golovin <dima@golovin.in>

    commit eefb8c124fd969e9a174ff2bedff86aa305a7438 upstream.

    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: https://github.com/ClangBuiltLinux/linux/issues/771
    Signed-off-by: Dmitry Golovin <dima@golovin.in>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    Makefile | 3 ++-
    arch/x86/boot/compressed/Makefile | 2 +-
    2 files changed, 3 insertions(+), 2 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -414,6 +414,7 @@ STRIP = $(CROSS_COMPILE)strip
    OBJCOPY = $(CROSS_COMPILE)objcopy
    OBJDUMP = $(CROSS_COMPILE)objdump
    OBJSIZE = $(CROSS_COMPILE)size
    +READELF = $(CROSS_COMPILE)readelf
    PAHOLE = pahole
    LEX = flex
    YACC = bison
    @@ -472,7 +473,7 @@ GCC_PLUGINS_CFLAGS :=
    CLANG_FLAGS :=

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

    --- a/arch/x86/boot/compressed/Makefile
    +++ b/arch/x86/boot/compressed/Makefile
    @@ -102,7 +102,7 @@ vmlinux-objs-$(CONFIG_EFI_MIXED) += $(ob
    quiet_cmd_check_data_rel = DATAREL $@
    define cmd_check_data_rel
    for obj in $(filter %.o,$^); do \
    - ${CROSS_COMPILE}readelf -S $$obj | grep -qF .rel.local && { \
    + $(READELF) -S $$obj | grep -qF .rel.local && { \
    echo "error: $$obj has data relocations!" >&2; \
    exit 1; \
    } || true; \

    \
     
     \ /
      Last update: 2020-08-24 11:43    [W:3.259 / U:1.692 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site