Re: [PATCH 03/27] perf tools: Move arch check into config/Makefile

[Sam Ravnborg <sam@ravnborg.org>]

On Mon, Apr 01, 2013 at 09:18:26PM +0200, Jiri Olsa wrote:
> Moving arch check into config/Makefile.
> 
> Signed-off-by: Jiri Olsa <jolsa@redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Stephane Eranian <eranian@google.com>
> ---
>  tools/perf/Makefile        | 31 ++-----------------------------
>  tools/perf/config/Makefile | 34 ++++++++++++++++++++++++++++++++++
>  2 files changed, 36 insertions(+), 29 deletions(-)
>  create mode 100644 tools/perf/config/Makefile
> 
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index c8fb0fd..032e099 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -55,37 +55,11 @@ include config/utilities.mak
>  $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
>  	@$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)
>  
> -uname_M := $(shell uname -m 2>/dev/null || echo not)
> -
> -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> -				  -e s/arm.*/arm/ -e s/sa110/arm/ \
> -				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
> -				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> -				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
> -NO_PERF_REGS := 1
> -
>  CC = $(CROSS_COMPILE)gcc
>  AR = $(CROSS_COMPILE)ar
>  
> -# Additional ARCH settings for x86
> -ifeq ($(ARCH),i386)
> -	override ARCH := x86
> -	NO_PERF_REGS := 0
> -	LIBUNWIND_LIBS = -lunwind -lunwind-x86
> -endif
> -ifeq ($(ARCH),x86_64)
> -	override ARCH := x86
> -	IS_X86_64 := 0
> -	ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
> -		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1)
> -	endif
> -	ifeq (${IS_X86_64}, 1)
> -		RAW_ARCH := x86_64
> -		ARCH_CFLAGS := -DARCH_X86_64
> -		ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
> -	endif
> -	NO_PERF_REGS := 0
> -	LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
> +ifeq ($(filter clean tags,$(MAKECMDGOALS)),)
> +include config/Makefile
>  endif
>  
>  # Treat warnings as errors unless directed not to
> @@ -857,7 +831,6 @@ ifeq ($(NO_PERF_REGS),0)
>  	ifeq ($(ARCH),x86)
>  		LIB_H += arch/x86/include/perf_regs.h
>  	endif
> -	BASIC_CFLAGS += -DHAVE_PERF_REGS
>  endif
>  
>  ifndef NO_STRLCPY
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> new file mode 100644
> index 0000000..fe317c2
> --- /dev/null
> +++ b/tools/perf/config/Makefile
> @@ -0,0 +1,34 @@
> +uname_M := $(shell uname -m 2>/dev/null || echo not)
> +
> +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> +				  -e s/arm.*/arm/ -e s/sa110/arm/ \
> +				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
> +				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> +				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )

this is shared with the top-level kernel Makefile.
Could we find a way to share this?

	Sam