diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-30 13:37:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 08:48:30 +0200 |
| commit | 3ae069cfda88349fa61de9631f878d39ab60764f (patch) | |
| tree | 18c534231d29180f8d62ba2063b9e7c505adeb91 | |
| parent | 8b6eb56a9570001634df1d2c7f38e7179a357362 (diff) | |
| download | op-kernel-dev-3ae069cfda88349fa61de9631f878d39ab60764f.zip op-kernel-dev-3ae069cfda88349fa61de9631f878d39ab60764f.tar.gz | |
tools/perf/build: Split out feature check: 'libnuma'
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-vixsrpggxFjhz7kppqgrGr6s@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/perf/config/Makefile | 7 | ||||
| -rw-r--r-- | tools/perf/config/feature-checks/Makefile | 7 | ||||
| -rw-r--r-- | tools/perf/config/feature-checks/test-libnuma.c | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index daefe2d..f39fc22 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -101,7 +101,9 @@ $(info Testing features:) $(shell make -i -j -C config/feature-checks >/dev/null 2>&1) $(info done) -FEATURE_TESTS = hello +FEATURE_TESTS = \ + hello \ + libnuma $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) @@ -434,8 +436,7 @@ ifndef NO_BACKTRACE endif ifndef NO_LIBNUMA - FLAGS_LIBNUMA = $(CFLAGS) $(LDFLAGS) -lnuma - ifneq ($(call try-cc,$(SOURCE_LIBNUMA),$(FLAGS_LIBNUMA),libnuma),y) + ifeq ($(feature-libnuma), 0) msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); NO_LIBNUMA := 1 else diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 4708cca..6a42ad2 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile @@ -1,5 +1,7 @@ -FILES=test-hello +FILES= \ + test-hello \ + test-libnuma CC := $(CC) -MD @@ -12,6 +14,9 @@ BUILD = $(CC) -o $(OUTPUT)$@ $@.c test-hello: $(BUILD) +test-libnuma: + $(BUILD) -lnuma + -include *.d */*.d ############################### diff --git a/tools/perf/config/feature-checks/test-libnuma.c b/tools/perf/config/feature-checks/test-libnuma.c new file mode 100644 index 0000000..70510a9 --- /dev/null +++ b/tools/perf/config/feature-checks/test-libnuma.c @@ -0,0 +1,8 @@ +#include <numa.h> +#include <numaif.h> + +int main(void) +{ + numa_available(); + return 0; +} |
