lkml.org 
[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/2] perf build: Group the NO_SYSCALL_TABLE logic
Em Fri, May 29, 2020 at 12:55:51PM -0300, Arnaldo Carvalho de Melo escreveu:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> To help in allowing to disable it from the make command line.
>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/perf/Makefile.config | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index ae325f79e598..93fb7510a9a9 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -23,12 +23,26 @@ include $(srctree)/tools/scripts/Makefile.arch
> $(call detected_var,SRCARCH)
>
> NO_PERF_REGS := 1
> +
> NO_SYSCALL_TABLE := 1
>
> +ifeq ($(SRCARCH),x86)
> + ifeq (${IS_64_BIT}, 1)
> + NO_SYSCALL_TABLE := 0
> + endif
> +else
> + ifneq ($(SRCARCH),$(filter $(SRCARCH),powerpc arm64 s390))

The above should've been a ifeq, to see if SRCARCH is one of those,
detected in the cross build tests, fixed.

- Arnaldo

> + NO_SYSCALL_TABLE := 0
> + endif
> +endif
> +
> +ifneq ($(NO_SYSCALL_TABLE),1)
> + CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT
> +endif
> +
> # Additional ARCH settings for ppc
> ifeq ($(SRCARCH),powerpc)
> NO_PERF_REGS := 0
> - NO_SYSCALL_TABLE := 0
> CFLAGS += -I$(OUTPUT)arch/powerpc/include/generated
> LIBUNWIND_LIBS := -lunwind -lunwind-ppc64
> endif
> @@ -37,7 +51,6 @@ endif
> ifeq ($(SRCARCH),x86)
> $(call detected,CONFIG_X86)
> ifeq (${IS_64_BIT}, 1)
> - NO_SYSCALL_TABLE := 0
> 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
> LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
> @@ -55,7 +68,6 @@ endif
>
> ifeq ($(SRCARCH),arm64)
> NO_PERF_REGS := 0
> - NO_SYSCALL_TABLE := 0
> CFLAGS += -I$(OUTPUT)arch/arm64/include/generated
> LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
> endif
> @@ -70,7 +82,6 @@ endif
>
> ifeq ($(ARCH),s390)
> NO_PERF_REGS := 0
> - NO_SYSCALL_TABLE := 0
> CFLAGS += -fPIC -I$(OUTPUT)arch/s390/include/generated
> endif
>
> @@ -78,10 +89,6 @@ ifeq ($(NO_PERF_REGS),0)
> $(call detected,CONFIG_PERF_REGS)
> 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.
> # Disable it on all other architectures in case libdw unwind
> # support is detected in system. Add supported architectures
> --
> 2.25.3
>

--

- Arnaldo

\
 
 \ /
  Last update: 2020-05-29 22:20    [W:0.060 / U:0.664 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site