Commit 5f36978c authored Oct 10, 2013 by Ingo Molnar Committed by Arnaldo Carvalho de Melo Oct 14, 2013

tools/perf/build: Simplify the libelf logic



Ulrich Drepper and Namhyung Kim reported that the libelf logic in
config/Makefile is duplicated in part.

Remove the duplication, and also remove the now unused FLAGS_LIBELF
variable.

Reported-by: Ulrich Drepper <drepper@gmail.com>
Reported-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 0dc09742

tools/perf/config/Makefile

+0 −8

Original line number	Diff line number	Diff line
		@@ -280,7 +280,6 @@ endif # NO_LIBELF

		ifndef NO_LIBELF
		CFLAGS += -DHAVE_LIBELF_SUPPORT
		FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)

		ifeq ($(feature-libelf-mmap), 1)
		CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
		@@ -305,13 +304,6 @@ ifndef NO_LIBELF
		endif # NO_DWARF
		endif # NO_LIBELF

		ifndef NO_LIBELF
		CFLAGS += -DHAVE_LIBELF_SUPPORT
		ifeq ($(feature-libelf-mmap), 1)
		CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
		endif
		endif # NO_LIBELF

		# There's only x86 (both 32 and 64) support for CFI unwind so far
		ifneq ($(ARCH),x86)
		NO_LIBUNWIND := 1