diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-05-01 02:24:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-05-01 02:24:59 -0400 |
commit | 3617660e4e1618a888a2e3a4067224534302cb33 (patch) | |
tree | 2fc27376eafe21b878b4cdcc450179c60f8beb37 /tools/perf/config | |
parent | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 (diff) | |
parent | 8ab596afb97bc9e2f9140dc1d993e81749acff42 (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Wire up perf_regs and unwind support for ARM64 (Jean Pihet)
* Move u64_swap union to its single user's header, evsel.h (Borislav Petkov)
* Fix for s390 to properly parse tracepoints plus test code (Alexander Yarygin)
* Handle EINTR error for readn/writen (Namhyung Kim)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/config')
-rw-r--r-- | tools/perf/config/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 802cf544202b..150c84c7416d 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -29,11 +29,17 @@ ifeq ($(ARCH),x86) | |||
29 | endif | 29 | endif |
30 | NO_PERF_REGS := 0 | 30 | NO_PERF_REGS := 0 |
31 | endif | 31 | endif |
32 | |||
32 | ifeq ($(ARCH),arm) | 33 | ifeq ($(ARCH),arm) |
33 | NO_PERF_REGS := 0 | 34 | NO_PERF_REGS := 0 |
34 | LIBUNWIND_LIBS = -lunwind -lunwind-arm | 35 | LIBUNWIND_LIBS = -lunwind -lunwind-arm |
35 | endif | 36 | endif |
36 | 37 | ||
38 | ifeq ($(ARCH),arm64) | ||
39 | NO_PERF_REGS := 0 | ||
40 | LIBUNWIND_LIBS = -lunwind -lunwind-aarch64 | ||
41 | endif | ||
42 | |||
37 | # So far there's only x86 libdw unwind support merged in perf. | 43 | # So far there's only x86 libdw unwind support merged in perf. |
38 | # Disable it on all other architectures in case libdw unwind | 44 | # Disable it on all other architectures in case libdw unwind |
39 | # support is detected in system. Add supported architectures | 45 | # support is detected in system. Add supported architectures |
@@ -370,7 +376,7 @@ else | |||
370 | endif | 376 | endif |
371 | 377 | ||
372 | ifndef NO_LIBUNWIND | 378 | ifndef NO_LIBUNWIND |
373 | ifeq ($(ARCH),arm) | 379 | ifeq ($(ARCH),$(filter $(ARCH),arm arm64)) |
374 | $(call feature_check,libunwind-debug-frame) | 380 | $(call feature_check,libunwind-debug-frame) |
375 | ifneq ($(feature-libunwind-debug-frame), 1) | 381 | ifneq ($(feature-libunwind-debug-frame), 1) |
376 | msg := $(warning No debug_frame support found in libunwind); | 382 | msg := $(warning No debug_frame support found in libunwind); |