linux-kernel - [tip:core/urgent] objtool: Allow building with older libelf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 17 May 2016 02:00:36 -0700
From:	tip-bot for Jan Beulich <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	JBeulich@...e.com, jolsa@...hat.com, jpoimboe@...hat.com,
	mingo@...nel.org, alexander.shishkin@...ux.intel.com,
	peterz@...radead.org, vincent.weaver@...ne.edu, tglx@...utronix.de,
	acme@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
	jbeulich@...e.com, torvalds@...ux-foundation.org,
	eranian@...gle.com
Subject: [tip:core/urgent] objtool: Allow building with older libelf

Commit-ID:  2e51f26245701cb28f154552836b7807159088a8
Gitweb:     http://git.kernel.org/tip/2e51f26245701cb28f154552836b7807159088a8
Author:     Jan Beulich <JBeulich@...e.com>
AuthorDate: Mon, 16 May 2016 15:31:07 -0500
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 17 May 2016 10:42:46 +0200

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@...e.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: <stable@...r.kernel.org> # for v4.6
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jan Beulich <JBeulich@...e.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Link: http://lkml.kernel.org/r/732dae6872b7ff187d94f22bb699a12849d3fe04.1463430618.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 tools/objtool/Makefile | 4 ++++
 tools/objtool/elf.h    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 6765c7e..f094f3c 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -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
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 7f3e00a..aa1ff65 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -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;