diff options
Diffstat (limited to 'tools/perf/config/Makefile')
-rw-r--r-- | tools/perf/config/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 802cf544202b..729bbdf5cec7 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -29,16 +29,22 @@ 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 | ||
37 | # So far there's only x86 libdw unwind support merged in perf. | 38 | ifeq ($(ARCH),arm64) |
39 | NO_PERF_REGS := 0 | ||
40 | LIBUNWIND_LIBS = -lunwind -lunwind-aarch64 | ||
41 | endif | ||
42 | |||
43 | # So far there's only x86 and arm 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 |
40 | # to the check. | 46 | # to the check. |
41 | ifneq ($(ARCH),x86) | 47 | ifneq ($(ARCH),$(filter $(ARCH),x86 arm)) |
42 | NO_LIBDW_DWARF_UNWIND := 1 | 48 | NO_LIBDW_DWARF_UNWIND := 1 |
43 | endif | 49 | endif |
44 | 50 | ||
@@ -168,7 +174,6 @@ CORE_FEATURE_TESTS = \ | |||
168 | libpython-version \ | 174 | libpython-version \ |
169 | libslang \ | 175 | libslang \ |
170 | libunwind \ | 176 | libunwind \ |
171 | on-exit \ | ||
172 | stackprotector-all \ | 177 | stackprotector-all \ |
173 | timerfd \ | 178 | timerfd \ |
174 | libdw-dwarf-unwind | 179 | libdw-dwarf-unwind |
@@ -194,7 +199,6 @@ VF_FEATURE_TESTS = \ | |||
194 | libelf-getphdrnum \ | 199 | libelf-getphdrnum \ |
195 | libelf-mmap \ | 200 | libelf-mmap \ |
196 | libpython-version \ | 201 | libpython-version \ |
197 | on-exit \ | ||
198 | stackprotector-all \ | 202 | stackprotector-all \ |
199 | timerfd \ | 203 | timerfd \ |
200 | libunwind-debug-frame \ | 204 | libunwind-debug-frame \ |
@@ -370,7 +374,7 @@ else | |||
370 | endif | 374 | endif |
371 | 375 | ||
372 | ifndef NO_LIBUNWIND | 376 | ifndef NO_LIBUNWIND |
373 | ifeq ($(ARCH),arm) | 377 | ifeq ($(ARCH),$(filter $(ARCH),arm arm64)) |
374 | $(call feature_check,libunwind-debug-frame) | 378 | $(call feature_check,libunwind-debug-frame) |
375 | ifneq ($(feature-libunwind-debug-frame), 1) | 379 | ifneq ($(feature-libunwind-debug-frame), 1) |
376 | msg := $(warning No debug_frame support found in libunwind); | 380 | msg := $(warning No debug_frame support found in libunwind); |
@@ -565,12 +569,6 @@ ifneq ($(filter -lbfd,$(EXTLIBS)),) | |||
565 | CFLAGS += -DHAVE_LIBBFD_SUPPORT | 569 | CFLAGS += -DHAVE_LIBBFD_SUPPORT |
566 | endif | 570 | endif |
567 | 571 | ||
568 | ifndef NO_ON_EXIT | ||
569 | ifeq ($(feature-on-exit), 1) | ||
570 | CFLAGS += -DHAVE_ON_EXIT_SUPPORT | ||
571 | endif | ||
572 | endif | ||
573 | |||
574 | ifndef NO_BACKTRACE | 572 | ifndef NO_BACKTRACE |
575 | ifeq ($(feature-backtrace), 1) | 573 | ifeq ($(feature-backtrace), 1) |
576 | CFLAGS += -DHAVE_BACKTRACE_SUPPORT | 574 | CFLAGS += -DHAVE_BACKTRACE_SUPPORT |