Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b11db658 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix build error on ARCH=i386/x86_64/sparc64 



He Kuang reported that current perf tools failed to build when ARCH
variable was given like above.

It was because the name is different that internal directory name.  I
can see that David's sparc64 build has same problem.

So fix it by applying the sed conversion script to the command line ARCH
variable also, and fixing the converted name there (i.e. i386/x86_64 ->
x86, sparc64 -> sparc).

Reported-by: default avatarHe Kuang <hekuang@huawei.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarHe Kuang <hekuang@huawei.com>
Acked: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1425270663-10215-1-git-send-email-namhyung@kernel.org


[ Resolved conflict with 4861f87c "Make sparc64 arch point to sparc" ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4aa5f4f7

tools/perf/config/Makefile.arch

+5 −22
Original line number Diff line number Diff line 
ifndef ARCH

ARCH := $(shell uname -m 2>/dev/null || echo not)

endif



uname_M := $(shell uname -m 2>/dev/null || echo not)



RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \

ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

                                  -e s/sun4u/sparc/ -e s/sparc64/sparc/ \

                                  -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/ \

                                  -e s/tile.*/tile/ )



# Additional ARCH settings for x86

ifeq ($(RAW_ARCH),i386)

  ARCH ?= x86

endif



ifeq ($(RAW_ARCH),x86_64)

  ARCH ?= x86



  ifneq (, $(findstring m32,$(CFLAGS)))

    RAW_ARCH := x86_32

  endif

endif



ifeq ($(RAW_ARCH),sparc64)

  ARCH ?= sparc

endif



ARCH ?= $(RAW_ARCH)



LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)

ifeq ($(LP64), 1)

  IS_64_BIT := 1