From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, will.deacon@arm.com,
cjashfor@linux.vnet.ibm.com, hpa@zytor.com, fweisbec@gmail.com,
linux-kernel@vger.kernel.org, bp@alien8.de, acme@redhat.com,
tglx@linutronix.de, eranian@google.com, jolsa@kernel.org,
dsahern@gmail.com, peterz@infradead.org,
alexis.berlemont@gmail.com, sukadev@linux.vnet.ibm.com,
namhyung@kernel.org, paulus@samba.org
Subject: [tip:perf/core] perf build: Add arch x86 objects building
Date: Wed, 18 Feb 2015 10:36:30 -0800 [thread overview]
Message-ID: <tip-5enob06z07m7ew6nzzdmp3n2@git.kernel.org> (raw)
Commit-ID: 5e8c0fb6a95728b852d56c0a9244425d474670c0
Gitweb: http://git.kernel.org/tip/5e8c0fb6a95728b852d56c0a9244425d474670c0
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Tue, 30 Dec 2014 14:03:40 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <jolsa@kernel.org>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-5enob06z07m7ew6nzzdmp3n2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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
reply other threads:[~2015-02-18 18:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5enob06z07m7ew6nzzdmp3n2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=alexis.berlemont@gmail.com \
--cc=bp@alien8.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=sukadev@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.