Commit 22dd1ac9 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

tools: Remove feature-libelf-mmap feature detection 



It's trivial to handle missing ELF_C_MMAP_READ support in libelf the way that
objtool has solved it in
("774bec3f objtool: Add fallback from ELF_C_READ_MMAP to ELF_C_READ").

So instead of having an entire feature detector for that, just do what objtool
does for perf and libbpf. And keep their Makefiles a bit simpler.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200819013607.3607269-5-andriin@fb.com
parent 85367030

tools/build/Makefile.feature

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ FEATURE_TESTS_BASIC := \ 
        libelf-getphdrnum               \

        libelf-gelf_getnote             \

        libelf-getshdrstrndx            \

        libelf-mmap                     \

        libnuma                         \

        numa_num_possible_cpus          \

        libperl                         \

tools/build/feature/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ FILES= \ 
         test-libelf-getphdrnum.bin             \

         test-libelf-gelf_getnote.bin           \

         test-libelf-getshdrstrndx.bin          \

         test-libelf-mmap.bin                   \

         test-libdebuginfod.bin                 \

         test-libnuma.bin                       \

         test-numa_num_possible_cpus.bin        \
@@ -146,9 +145,6 @@ $(OUTPUT)test-dwarf.bin: 
$(OUTPUT)test-dwarf_getlocations.bin:

	$(BUILD) $(DWARFLIBS)



$(OUTPUT)test-libelf-mmap.bin:

	$(BUILD) -lelf



$(OUTPUT)test-libelf-getphdrnum.bin:

	$(BUILD) -lelf

tools/build/feature/test-all.c

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
# include "test-libelf.c"

#undef main



#define main main_test_libelf_mmap

# include "test-libelf-mmap.c"

#undef main



#define main main_test_get_current_dir_name

# include "test-get_current_dir_name.c"

#undef main

tools/build/feature/test-libelf-mmap.c

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <libelf.h>



int main(void)

{

	Elf *elf = elf_begin(0, ELF_C_READ_MMAP, 0);



	return (long)elf;

}

tools/lib/bpf/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ ifndef VERBOSE 
endif



FEATURE_USER = .libbpf

FEATURE_TESTS = libelf libelf-mmap zlib bpf

FEATURE_TESTS = libelf zlib bpf

FEATURE_DISPLAY = libelf zlib bpf



INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
@@ -98,10 +98,6 @@ else 
  CFLAGS := -g -Wall

endif



ifeq ($(feature-libelf-mmap), 1)

  override CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT

endif



# Append required CFLAGS

override CFLAGS += $(EXTRA_WARNINGS) -Wno-switch-enum

override CFLAGS += -Werror -Wall