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
This commit is contained in:
commit
c4a346002b
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue