Commit 2e51f262 authored May 16, 2016 by Jan Beulich Committed by Ingo Molnar May 17, 2016

objtool: Allow building with older libelf



The switch to elf_getshdr{num,strndx} post-dates the oldest tool chain
the kernel is supposed to be able to build with, so try to cope with
such an environment.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: <stable@vger.kernel.org> # for v4.6
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/732dae6872b7ff187d94f22bb699a12849d3fe04.1463430618.git.jpoimboe@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent bc231d9e

tools/objtool/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,10 @@ INCLUDES := -I$(srctree)/tools/include
		CFLAGS += -Wall -Werror $(EXTRA_WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
		LDFLAGS += -lelf $(LIBSUBCMD)

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

		AWK = awk
		export srctree OUTPUT CFLAGS ARCH AWK
		include $(srctree)/tools/build/Makefile.include

tools/objtool/elf.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,11 @@
		#include <linux/list.h>
		#include <linux/hashtable.h>

		#ifdef LIBELF_USE_DEPRECATED
		# define elf_getshdrnum elf_getshnum
		# define elf_getshdrstrndx elf_getshstrndx
		#endif

		struct section {
		struct list_head list;
		GElf_Shdr sh;

Admin message