diff options
| author | Ingo Molnar | 2015-09-18 09:24:01 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-09-18 09:24:01 +0200 |
| commit | 02386c356af0ce5bbee11ed9b23c312ca60298f0 (patch) | |
| tree | 24d6816d783975cbc237af3a53c34f44fda03de2 /tools/perf/config/Makefile | |
| parent | Merge branch 'perf/urgent' into perf/core, to resolve a conflict (diff) | |
| parent | perf: Fix races in computing the header sizes (diff) | |
| download | kernel-qcow2-linux-02386c356af0ce5bbee11ed9b23c312ca60298f0.tar.gz kernel-qcow2-linux-02386c356af0ce5bbee11ed9b23c312ca60298f0.tar.xz kernel-qcow2-linux-02386c356af0ce5bbee11ed9b23c312ca60298f0.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/config/Makefile')
| -rw-r--r-- | tools/perf/config/Makefile | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 0435ac41cea9..ab09adaabc9c 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -577,9 +577,14 @@ ifndef NO_LIBNUMA msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev); NO_LIBNUMA := 1 else - CFLAGS += -DHAVE_LIBNUMA_SUPPORT - EXTLIBS += -lnuma - $(call detected,CONFIG_NUMA) + ifeq ($(feature-numa_num_possible_cpus), 0) + msg := $(warning Old numa library found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev >= 2.0.8); + NO_LIBNUMA := 1 + else + CFLAGS += -DHAVE_LIBNUMA_SUPPORT + EXTLIBS += -lnuma + $(call detected,CONFIG_NUMA) + endif endif endif @@ -625,8 +630,13 @@ ifdef LIBBABELTRACE endif ifndef NO_AUXTRACE - $(call detected,CONFIG_AUXTRACE) - CFLAGS += -DHAVE_AUXTRACE_SUPPORT + ifeq ($(feature-get_cpuid), 0) + msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); + NO_AUXTRACE := 1 + else + $(call detected,CONFIG_AUXTRACE) + CFLAGS += -DHAVE_AUXTRACE_SUPPORT + endif endif # Among the variables below, these: |