[PATCH 016/161] tools/perf/build: Split out feature check: 'libelf-getphdrnum'

From: Arnaldo Carvalho de Melo
Date: Mon Oct 14 2013 - 16:53:08 EST


From: Ingo Molnar <mingo@xxxxxxxxxx>

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-wa9qstb8erbjreLxiHepzjfw@xxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/perf/config/Makefile | 5 +++--
tools/perf/config/feature-checks/Makefile | 4 ++++
tools/perf/config/feature-checks/test-libelf-getphdrnum.c | 7 +++++++
3 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 tools/perf/config/feature-checks/test-libelf-getphdrnum.c

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index bf1f021d2467..718b47611340 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -112,6 +112,7 @@ FEATURE_TESTS = \
glibc \
dwarf \
libelf-mmap \
+ libelf-getphdrnum \
libnuma

$(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test)))
@@ -207,7 +208,7 @@ ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
endif

- ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM_SUPPORT),y)
+ ifeq ($(feature-libelf-getphdrnum), 1)
CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
endif

@@ -230,7 +231,7 @@ ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBELF_SUPPORT
ifeq ($(feature-libelf-mmap), 1)
CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
- endif # try-cc
+ endif
endif # NO_LIBELF

# There's only x86 (both 32 and 64) support for CFI unwind so far
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index bf96e34509f4..83b3a02b64d8 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -10,6 +10,7 @@ FILES= \
test-glibc \
test-dwarf \
test-libelf-mmap \
+ test-libelf-getphdrnum \
test-libnuma

CC := $(CC) -MD
@@ -50,6 +51,9 @@ test-dwarf:
test-libelf-mmap:
$(BUILD) -lelf

+test-libelf-getphdrnum:
+ $(BUILD) -lelf
+
test-libnuma:
$(BUILD) -lnuma

diff --git a/tools/perf/config/feature-checks/test-libelf-getphdrnum.c b/tools/perf/config/feature-checks/test-libelf-getphdrnum.c
new file mode 100644
index 000000000000..58eca5332520
--- /dev/null
+++ b/tools/perf/config/feature-checks/test-libelf-getphdrnum.c
@@ -0,0 +1,7 @@
+#include <libelf.h>
+#
+int main(void)
+{
+ size_t dst;
+ return elf_getphdrnum(0, &dst);
+}
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/