diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 23:52:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 23:52:19 (GMT) |
| commit | c4a346002bc06046bc51910a7ade3a0c650c3d34 (patch) | |
| tree | a1a8a29e423fce067a784ec89068532637bebc8e | |
| parent | 0985b65d3ba2c09f10a594b73df45c1f7f68d317 (diff) | |
| parent | 2e51f26245701cb28f154552836b7807159088a8 (diff) | |
| download | linux-c4a346002bc06046bc51910a7ade3a0c650c3d34.tar.xz | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool build fix from Ingo Molnar:
"An libtool fix for older libelf versions"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Allow building with older libelf
| -rw-r--r-- | tools/objtool/Makefile | 4 | ||||
| -rw-r--r-- | tools/objtool/elf.h | 5 |
2 files changed, 9 insertions, 0 deletions
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; |