objtool fix

GIT PULL Ingo Molnar 1 participant 1 message May 25, 2016 objtool

lore

Share & tools

lore

Ingo Molnar

author

2016-05-25 20:11 UTC #0 lore raw

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 2e51f26245701cb28f154552836b7807159088a8 objtool: Allow building with older libelf

An libtool fix for older libelf versions.

Thanks,

Ingo

------------------>
Jan Beulich (1):
objtool: Allow building with older libelf

 tools/objtool/Makefile | 4 ++++
 tools/objtool/elf.h    | 5 +++++
 2 files changed, 9 insertions(+)

tools/objtool/Makefile +4 -0

index 6765c7e949f3..f094f3c4ed84 100644
@@ -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

index 7f3e00a2f907..aa1ff6596684 100644
@@ -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;