Commit-ID: 5e8c0fb6a95728b852d56c0a9244425d474670c0 Gitweb: http://git.kernel.org/tip/5e8c0fb6a95728b852d56c0a9244425d474670c0 Author: Jiri Olsa <[email protected]> AuthorDate: Tue, 30 Dec 2014 14:03:40 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 12 Feb 2015 13:12:01 -0300
perf build: Add arch x86 objects building Move the x86 arch objects building under build framework to be included in the libperf build object. Adding also arch/$(ARCH)/Build files for the rest of the archs. The reason for this is that in arch/Build we now do: +libperf-y += $(ARCH)/ which would make the build to fail on other architectures, because the build framework requires 'Build' file in nested directories and this patch adds it only for x86. Signed-off-by: Jiri Olsa <[email protected]> Tested-by: Sukadev Bhattiprolu <[email protected]> Tested-by: Will Deacon <[email protected]> Cc: Alexis Berlemont <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/arch/Build | 1 + tools/{build/tests/ex/empty => perf/arch/arm}/Build | 0 tools/{build/tests/ex/empty => perf/arch/arm64}/Build | 0 tools/{build/tests/ex/empty => perf/arch/powerpc}/Build | 0 tools/{build/tests/ex/empty => perf/arch/s390}/Build | 0 tools/{build/tests/ex/empty => perf/arch/sh}/Build | 0 tools/{build/tests/ex/empty => perf/arch/sparc}/Build | 0 tools/perf/arch/x86/Build | 2 ++ tools/perf/arch/x86/Makefile | 15 --------------- tools/perf/arch/x86/tests/Build | 2 ++ tools/perf/arch/x86/util/Build | 8 ++++++++ 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 304f5e7..109eb75 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1 +1,2 @@ libperf-y += common.o +libperf-y += $(ARCH)/ diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/arm/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/arm/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/arm64/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/arm64/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/powerpc/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/powerpc/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/s390/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/s390/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/sh/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/sh/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/sparc/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/sparc/Build diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build new file mode 100644 index 0000000..41bf61d --- /dev/null +++ b/tools/perf/arch/x86/Build @@ -0,0 +1,2 @@ +libperf-y += util/ +libperf-$(CONFIG_DWARF_UNWIND) += tests/ diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 9b21881..21322e0 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -1,19 +1,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o endif -ifndef NO_LIBUNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o -endif -ifndef NO_LIBDW_DWARF_UNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libdw.o -endif -ifndef NO_DWARF_UNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o -endif -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o -LIB_H += arch/$(ARCH)/util/tsc.h HAVE_KVM_STAT_SUPPORT := 1 -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/kvm-stat.o diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build new file mode 100644 index 0000000..b30eff9 --- /dev/null +++ b/tools/perf/arch/x86/tests/Build @@ -0,0 +1,2 @@ +libperf-y += regs_load.o +libperf-y += dwarf-unwind.o diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build new file mode 100644 index 0000000..cfbccc4 --- /dev/null +++ b/tools/perf/arch/x86/util/Build @@ -0,0 +1,8 @@ +libperf-y += header.o +libperf-y += tsc.o +libperf-y += kvm-stat.o + +libperf-$(CONFIG_DWARF) += dwarf-regs.o + +libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o +libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
