perf build: Group the NO_SYSCALL_TABLE logic

To help in allowing to disable it from the make command line.

Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20200529155552.463-2-acme@kernel.org
[ Fixed the logic for the filter part, it should be ifeq, not ifneq ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2020-05-28 11:47:24 -03:00
parent 9b2d2066dd
commit 9b90d9734a

View File

@ -23,12 +23,26 @@ include $(srctree)/tools/scripts/Makefile.arch
$(call detected_var,SRCARCH) $(call detected_var,SRCARCH)
NO_PERF_REGS := 1 NO_PERF_REGS := 1
NO_SYSCALL_TABLE := 1 NO_SYSCALL_TABLE := 1
ifeq ($(SRCARCH),x86)
ifeq (${IS_64_BIT}, 1)
NO_SYSCALL_TABLE := 0
endif
else
ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc arm64 s390))
NO_SYSCALL_TABLE := 0
endif
endif
ifneq ($(NO_SYSCALL_TABLE),1)
CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT
endif
# Additional ARCH settings for ppc # Additional ARCH settings for ppc
ifeq ($(SRCARCH),powerpc) ifeq ($(SRCARCH),powerpc)
NO_PERF_REGS := 0 NO_PERF_REGS := 0
NO_SYSCALL_TABLE := 0
CFLAGS += -I$(OUTPUT)arch/powerpc/include/generated CFLAGS += -I$(OUTPUT)arch/powerpc/include/generated
LIBUNWIND_LIBS := -lunwind -lunwind-ppc64 LIBUNWIND_LIBS := -lunwind -lunwind-ppc64
endif endif
@ -37,7 +51,6 @@ endif
ifeq ($(SRCARCH),x86) ifeq ($(SRCARCH),x86)
$(call detected,CONFIG_X86) $(call detected,CONFIG_X86)
ifeq (${IS_64_BIT}, 1) ifeq (${IS_64_BIT}, 1)
NO_SYSCALL_TABLE := 0
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -I$(OUTPUT)arch/x86/include/generated CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -I$(OUTPUT)arch/x86/include/generated
ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
@ -55,7 +68,6 @@ endif
ifeq ($(SRCARCH),arm64) ifeq ($(SRCARCH),arm64)
NO_PERF_REGS := 0 NO_PERF_REGS := 0
NO_SYSCALL_TABLE := 0
CFLAGS += -I$(OUTPUT)arch/arm64/include/generated CFLAGS += -I$(OUTPUT)arch/arm64/include/generated
LIBUNWIND_LIBS = -lunwind -lunwind-aarch64 LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
endif endif
@ -70,7 +82,6 @@ endif
ifeq ($(ARCH),s390) ifeq ($(ARCH),s390)
NO_PERF_REGS := 0 NO_PERF_REGS := 0
NO_SYSCALL_TABLE := 0
CFLAGS += -fPIC -I$(OUTPUT)arch/s390/include/generated CFLAGS += -fPIC -I$(OUTPUT)arch/s390/include/generated
endif endif
@ -78,10 +89,6 @@ ifeq ($(NO_PERF_REGS),0)
$(call detected,CONFIG_PERF_REGS) $(call detected,CONFIG_PERF_REGS)
endif endif
ifneq ($(NO_SYSCALL_TABLE),1)
CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT
endif
# So far there's only x86 and arm libdw unwind support merged in perf. # So far there's only x86 and arm libdw unwind support merged in perf.
# Disable it on all other architectures in case libdw unwind # Disable it on all other architectures in case libdw unwind
# support is detected in system. Add supported architectures # support is detected in system. Add supported architectures