summaryrefslogtreecommitdiff
path: root/tools/perf/config
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2014-10-23 13:45:24 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-10-29 10:32:48 -0200
commit46b1fa85ff5a2e03423770b3931b97266e8ac6cf (patch)
tree1141f5e2227417cf3bff0e489eac16f0bd5e306f /tools/perf/config
parentf6832e1720f5cc283703cfe9ccbfb46a3fb6f548 (diff)
perf tools: Do not attempt to run perf-read-vdso32 if it wasn't built
popen() causes an error message to print if perf-read-vdso32 does not run. Avoid that by not trying to run it if it was not built. Ditto perf-read-vdsox32. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1414061124-26830-17-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/config')
-rw-r--r--tools/perf/config/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 3ba2382a5236..71264e41fa85 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -627,7 +627,9 @@ endif
ifeq (${IS_64_BIT}, 1)
ifndef NO_PERF_READ_VDSO32
$(call feature_check,compile-32)
- ifneq ($(feature-compile-32), 1)
+ ifeq ($(feature-compile-32), 1)
+ CFLAGS += -DHAVE_PERF_READ_VDSO32
+ else
NO_PERF_READ_VDSO32 := 1
endif
endif
@@ -636,7 +638,9 @@ ifeq (${IS_64_BIT}, 1)
endif
ifndef NO_PERF_READ_VDSOX32
$(call feature_check,compile-x32)
- ifneq ($(feature-compile-x32), 1)
+ ifeq ($(feature-compile-x32), 1)
+ CFLAGS += -DHAVE_PERF_READ_VDSOX32
+ else
NO_PERF_READ_VDSOX32 := 1
endif
endif