lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 135/146] objtool: Query pkg-config for libelf location
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Rolf Eike Beer <eb@emlix.com>

    commit 056d28d135bca0b1d0908990338e00e9dadaf057 upstream.

    If it is not in the default location, compilation fails at several points.

    Signed-off-by: Rolf Eike Beer <eb@emlix.com>
    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: stable@vger.kernel.org
    Link: https://lkml.kernel.org/r/91a25e992566a7968fedc89ec80e7f4c83ad0548.1553622500.git.jpoimboe@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Makefile | 4 +++-
    tools/objtool/Makefile | 7 +++++--
    2 files changed, 8 insertions(+), 3 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -944,9 +944,11 @@ mod_sign_cmd = true
    endif
    export mod_sign_cmd

    +HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
    +
    ifdef CONFIG_STACK_VALIDATION
    has_libelf := $(call try-run,\
    - echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
    + echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)
    ifeq ($(has_libelf),1)
    objtool_target := tools/objtool FORCE
    else
    --- a/tools/objtool/Makefile
    +++ b/tools/objtool/Makefile
    @@ -25,14 +25,17 @@ LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcm
    OBJTOOL := $(OUTPUT)objtool
    OBJTOOL_IN := $(OBJTOOL)-in.o

    +LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null)
    +LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
    +
    all: $(OBJTOOL)

    INCLUDES := -I$(srctree)/tools/include \
    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
    -I$(srctree)/tools/objtool/arch/$(ARCH)/include
    WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
    -CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES)
    -LDFLAGS += -lelf $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
    +CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
    +LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)

    # Allow old libelf to be used:
    elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)

    \
     
     \ /
      Last update: 2019-04-01 20:08    [W:5.051 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site