Commit-ID: 8869b17ee0bdd0da3d1f7d7ced284ab444c2c6d8
Gitweb: http://git.kernel.org/tip/8869b17ee0bdd0da3d1f7d7ced284ab444c2c6d8
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Mon, 30 Sep 2013 15:02:28 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Wed, 9 Oct 2013 08:48:37 +0200
tools/perf/build: Split out feature check: 'libelf-mmap'
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-9fxnxjcmrgbSvipxlwsdQ8fg@xxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/perf/config/Makefile | 6 +++---
tools/perf/config/feature-checks/Makefile | 4 ++++
.../config/feature-checks/{test-libelf.c => test-libelf-mmap.c} | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 8a27de2..bf1f021 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -111,6 +111,7 @@ FEATURE_TESTS = \
libelf \
glibc \
dwarf \
+ libelf-mmap \
libnuma
$(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test)))
@@ -202,7 +203,7 @@ ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBELF_SUPPORT
FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
- ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
+ ifeq ($(feature-libelf-mmap), 1)
CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
endif
@@ -227,8 +228,7 @@ endif # NO_LIBELF
ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBELF_SUPPORT
- FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
- ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
+ ifeq ($(feature-libelf-mmap), 1)
CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
endif # try-cc
endif # NO_LIBELF
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 566a71d..bf96e34 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -9,6 +9,7 @@ FILES= \
test-libelf \
test-glibc \
test-dwarf \
+ test-libelf-mmap \
test-libnuma
CC := $(CC) -MD
@@ -46,6 +47,9 @@ test-glibc:
test-dwarf:
$(BUILD) -ldw
+test-libelf-mmap:
+ $(BUILD) -lelf
+
test-libnuma:
$(BUILD) -lnuma
diff --git a/tools/perf/config/feature-checks/test-libelf.c b/tools/perf/config/feature-checks/test-libelf-mmap.c
similarity index 54%
copy from tools/perf/config/feature-checks/test-libelf.c
copy to tools/perf/config/feature-checks/test-libelf-mmap.c
index 1a08f97..1c64815 100644
--- a/tools/perf/config/feature-checks/test-libelf.c
+++ b/tools/perf/config/feature-checks/test-libelf-mmap.c
@@ -1,7 +1,7 @@
#include <libelf.h>
-
+#
int main(void)
{
- Elf *elf = elf_begin(0, ELF_C_READ, 0);
+ Elf *elf = elf_begin(0, ELF_C_READ_MMAP, 0);
return (long)elf;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|