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

Commit a6cf5f39 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move arch setup into seprate Makefile 



I need to use arch related setup in the tests/make, so moving arch setup
into Makefile.arch.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1388759553-12974-1-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 41cde476

tools/perf/config/Makefile

+18 −34
Original line number Original line Diff line number Diff line 
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/ \

ifeq ($(src-perf),)

                                  -e s/arm.*/arm/ -e s/sa110/arm/ \

src-perf := $(srctree)/tools/perf

                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \

endif

                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

                                  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )

NO_PERF_REGS := 1

CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)





# Additional ARCH settings for x86

ifeq ($(obj-perf),)

ifeq ($(ARCH),i386)

obj-perf := $(OUTPUT)

  override ARCH := x86

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS = -lunwind -lunwind-x86

endif

endif





ifeq ($(ARCH),x86_64)

ifneq ($(obj-perf),)

  override ARCH := x86

obj-perf := $(abspath $(obj-perf))/

  IS_X86_64 := 0

  ifeq (, $(findstring m32,$(CFLAGS)))

    IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1)

endif

endif



LIB_INCLUDE := $(srctree)/tools/lib/

CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)



include $(src-perf)/config/Makefile.arch



NO_PERF_REGS := 1



# Additional ARCH settings for x86

ifeq ($(ARCH),x86)

  ifeq (${IS_X86_64}, 1)

  ifeq (${IS_X86_64}, 1)

    RAW_ARCH := x86_64

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT

    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 -lunwind-x86_64

    LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
@@ -64,20 +62,6 @@ ifeq ($(NO_PERF_REGS),0) 
  CFLAGS += -DHAVE_PERF_REGS_SUPPORT

  CFLAGS += -DHAVE_PERF_REGS_SUPPORT

endif

endif





ifeq ($(src-perf),)

src-perf := $(srctree)/tools/perf

endif



ifeq ($(obj-perf),)

obj-perf := $(OUTPUT)

endif



ifneq ($(obj-perf),)

obj-perf := $(abspath $(obj-perf))/

endif



LIB_INCLUDE := $(srctree)/tools/lib/



# include ARCH specific config

# include ARCH specific config

-include $(src-perf)/arch/$(ARCH)/Makefile

-include $(src-perf)/arch/$(ARCH)/Makefile

tools/perf/config/Makefile.arch

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 


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



# Additional ARCH settings for x86

ifeq ($(ARCH),i386)

  override ARCH := x86

endif



ifeq ($(ARCH),x86_64)

  override ARCH := x86

  IS_X86_64 := 0

  ifeq (, $(findstring m32,$(CFLAGS)))

    IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1)

    RAW_ARCH := x86_64

  endif

endif