[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/
commit: 9ae67d65c63c3236ec11a8f94439af32e0637fa3 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 17 12:23:44 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Mar 18 20:00:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae67d65 dev-util/perf: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> dev-util/perf/files/perf-6.6-ia64.patch | 12 1 file changed, 12 deletions(-) diff --git a/dev-util/perf/files/perf-6.6-ia64.patch b/dev-util/perf/files/perf-6.6-ia64.patch deleted file mode 100644 index 111efe2ff2e7.. --- a/dev-util/perf/files/perf-6.6-ia64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/arch/ia64/include/asm/barrier.h b/tools/arch/ia64/include/asm/barrier.h -index 6fffe5682713..9753f11d79ad 100644 a/tools/arch/ia64/include/asm/barrier.h -+++ b/tools/arch/ia64/include/asm/barrier.h -@@ -14,6 +14,7 @@ - #ifndef _TOOLS_LINUX_ASM_IA64_BARRIER_H - #define _TOOLS_LINUX_ASM_IA64_BARRIER_H - -+#include - #include - - /*
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: 443b60a7c73a5637dad6a47a50b5351163572818 Author: Guilherme Amadio gentoo org> AuthorDate: Thu Jul 6 15:51:37 2023 + Commit: Guilherme Amadio gentoo org> CommitDate: Thu Jul 6 16:11:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443b60a7 dev-util/perf: drop 5.19-r1, 6.0-r1, 6.2-r1 Closes: https://bugs.gentoo.org/832704 Closes: https://bugs.gentoo.org/855539 Signed-off-by: Guilherme Amadio gentoo.org> dev-util/perf/Manifest| 4 - dev-util/perf/files/perf-5.18-clang.patch | 45 - dev-util/perf/perf-5.19-r1.ebuild | 274 -- dev-util/perf/perf-6.0-r1.ebuild | 269 - dev-util/perf/perf-6.2-r1.ebuild | 269 - 5 files changed, 861 deletions(-) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index 32507222d0a3..a8c77095f0ca 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -1,6 +1,2 @@ -DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 -DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 -DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65 DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928 -DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/dev-util/perf/files/perf-5.18-clang.patch b/dev-util/perf/files/perf-5.18-clang.patch deleted file mode 100644 index d1c9a48e6848.. --- a/dev-util/perf/files/perf-5.18-clang.patch +++ /dev/null @@ -1,45 +0,0 @@ - -Fix building against LLVM/Clang with monolithic libraries. - a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- $(shell $(LLVM_CONFIG) --libs Core BPF) \ -+ $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - -@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- -Wl,--start-group -lclangBasic -lclangDriver\ ---lclangFrontend -lclangEdit -lclangLex\ ---lclangAST -Wl,--end-group\ -- $(shell $(LLVM_CONFIG) --libs Core option) \ -+ -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) - LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group - - ifeq ($(USE_CLANG), 1) -- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization -- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l)) -- LIBCLANG = $(foreach
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: 529bc1649627b30bad63527bedb0cf272db67b81 Author: Guilherme Amadio gentoo org> AuthorDate: Wed Jul 5 13:07:20 2023 + Commit: Guilherme Amadio gentoo org> CommitDate: Thu Jul 6 07:38:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529bc164 dev-util/perf: version bump to 6.4 Signed-off-by: Guilherme Amadio gentoo.org> dev-util/perf/Manifest| 1 + dev-util/perf/files/perf-6.4-libtracefs.patch | 23 ++ dev-util/perf/metadata.xml| 3 + dev-util/perf/perf-6.4.ebuild | 308 ++ 4 files changed, 335 insertions(+) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index 46a7ae78c623..32507222d0a3 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -2,4 +2,5 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65 +DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/dev-util/perf/files/perf-6.4-libtracefs.patch b/dev-util/perf/files/perf-6.4-libtracefs.patch new file mode 100644 index ..e02e2db96677 --- /dev/null +++ b/dev-util/perf/files/perf-6.4-libtracefs.patch @@ -0,0 +1,23 @@ +Let perf find libtraceevent headers when detecting libtracefs + +--- a/tools/build/feature/test-libtracefs.c b/tools/build/feature/test-libtracefs.c +@@ -1,5 +1,5 @@ + // SPDX-License-Identifier: GPL-2.0 +-#include ++#include + + int main(void) + { +--- a/tools/perf/Makefile.config b/tools/perf/Makefile.config +@@ -185,6 +185,9 @@ endif + FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) + FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf + ++FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs) ++FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs) ++ + ifdef LIBZSTD_DIR + LIBZSTD_CFLAGS := -I$(LIBZSTD_DIR)/lib + LIBZSTD_LDFLAGS := -L$(LIBZSTD_DIR)/lib diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml index a363827ff153..44f52d4869a8 100644 --- a/dev-util/perf/metadata.xml +++ b/dev-util/perf/metadata.xml @@ -14,6 +14,7 @@ Guilherme Amadio +Enable support for eBPF features with dev-libs/libbpf Enable dev-util/babeltrace support Enable builtin clang and LLVM support @@ -24,6 +25,8 @@ systems. Enable dev-libs/libpfm support +Enable dev-libs/libtraceevent support +Enable dev-libs/libtracefs support Enable NUMA support Add support for Perl as a scripting language for perf tools. diff --git a/dev-util/perf/perf-6.4.ebuild b/dev-util/perf/perf-6.4.ebuild new file mode 100644 index ..2ef01e9f9d7b --- /dev/null +++ b/dev-util/perf/perf-6.4.ebuild @@ -0,0 +1,308 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit bash-completion-r1 estack linux-info llvm toolchain-funcs python-r1 + +DESCRIPTION="Userland tools for Linux Performance Counters" +HOMEPAGE="https://perf.wiki.kernel.org/; + +LINUX_V="${PV:0:1}.x" +if [[ ${PV} == *_rc* ]] ; then + LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) + PATCH_VERSION=$(ver_cut 1-3) + LINUX_PATCH=patch-${PV//_/-}.xz + SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} +
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: d1a3661d06ab2036402024ea792bad26b7eb2cda Author: Sam James gentoo org> AuthorDate: Sat Apr 15 05:11:21 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 15 05:11:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a3661d dev-util/perf: fix build w/ clang 16 Closes: https://bugs.gentoo.org/904169 Thanks-to: Maciej S. Szmigiero maciej.szmigiero.name> Signed-off-by: Sam James gentoo.org> dev-util/perf/files/perf-6.0-c++17.patch | 39 dev-util/perf/perf-6.0-r1.ebuild | 1 + dev-util/perf/perf-6.2-r1.ebuild | 1 + 3 files changed, 41 insertions(+) diff --git a/dev-util/perf/files/perf-6.0-c++17.patch b/dev-util/perf/files/perf-6.0-c++17.patch new file mode 100644 index ..08c34bc552ca --- /dev/null +++ b/dev-util/perf/files/perf-6.0-c++17.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/904169 +--- a/tools/perf/Makefile.config b/tools/perf/Makefile.config +@@ -309,7 +309,7 @@ + CORE_CFLAGS += -Wextra + CORE_CFLAGS += -std=gnu11 + +-CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti ++CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti + CXXFLAGS += -Wall + CXXFLAGS += -fno-omit-frame-pointer + CXXFLAGS += -ggdb3 +--- a/tools/build/feature/Makefile b/tools/build/feature/Makefile +@@ -339,7 +339,7 @@ + $(BUILD) + + $(OUTPUT)test-llvm.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + $(shell $(LLVM_CONFIG) --libs) \ +@@ -347,12 +347,12 @@ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-llvm-version.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-clang.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \ + diff --git a/dev-util/perf/perf-6.0-r1.ebuild b/dev-util/perf/perf-6.0-r1.ebuild index be9dbc82a5f9..04184b462006 100644 --- a/dev-util/perf/perf-6.0-r1.ebuild +++ b/dev-util/perf/perf-6.0-r1.ebuild @@ -145,6 +145,7 @@ src_prepare() { pushd "${S_K}" >/dev/null || die eapply "${FILESDIR}"/${P}-clang.patch + eapply "${FILESDIR}"/perf-6.0-c++17.patch popd || die # Drop some upstream too-developer-oriented flags and fix the diff --git a/dev-util/perf/perf-6.2-r1.ebuild b/dev-util/perf/perf-6.2-r1.ebuild index 8dc6385d598e..8a46cf67337d 100644 --- a/dev-util/perf/perf-6.2-r1.ebuild +++ b/dev-util/perf/perf-6.2-r1.ebuild @@ -145,6 +145,7 @@ src_prepare() { pushd "${S_K}" >/dev/null || die eapply "${FILESDIR}"/perf-6.0-clang.patch + eapply "${FILESDIR}"/perf-6.0-c++17.patch popd || die # Drop some upstream too-developer-oriented flags and fix the
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: 41355d5ee50bb0cb7af9058f0af753a7cf73d602 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 17 04:59:08 2022 + Commit: Michał Górny gentoo org> CommitDate: Thu Nov 17 04:59:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41355d5e dev-util/perf: Remove old Signed-off-by: Michał Górny gentoo.org> dev-util/perf/Manifest | 4 - dev-util/perf/files/perf-5.15-clang.patch | 231 dev-util/perf/files/perf-5.17.1-clang.patch | 61 --- dev-util/perf/perf-5.15-r1.ebuild | 266 dev-util/perf/perf-5.17.1.ebuild| 264 --- dev-util/perf/perf-5.18.ebuild | 264 --- 6 files changed, 1090 deletions(-) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index e5f10036beaf..076d2671e177 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -1,7 +1,3 @@ -DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b83a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a -DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b -DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 -DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/dev-util/perf/files/perf-5.15-clang.patch b/dev-util/perf/files/perf-5.15-clang.patch deleted file mode 100644 index 5ea0c75f27f1.. --- a/dev-util/perf/files/perf-5.15-clang.patch +++ /dev/null @@ -1,231 +0,0 @@ -From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001 -From: Ian Rogers -Date: Mon, 11 Oct 2021 19:13:20 -0700 -Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14 - -LLVM 9 (current release is LLVM 13) moved the minimum C++ version to -GNU++14. Bump the version numbers in the feature test and perf build. - -Reviewed-by: Fangrui Song -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Daniel Borkmann -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Leo Yan -Cc: Mark Rutland -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Nathan Chancellor -Cc: Nick Desaulniers -Cc: Peter Zijlstra -Cc: Sedat Dilek -Cc: l...@lists.linux.dev -Link: https://lore.kernel.org/r/20211012021321.291635-1-irog...@google.com -Signed-off-by: Arnaldo Carvalho de Melo - tools/build/feature/Makefile | 6 +++--- - tools/perf/Makefile.config | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile -index eff55d287db1..9756e589e4ae 100644 a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin: - $(BUILD) - - $(OUTPUT)test-llvm.bin: -- $(BUILDXX) -std=gnu++11 \ -+ $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ - $(shell $(LLVM_CONFIG) --libs Core BPF) \ -@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin: -
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: 322b4e15ef689afbf118da25f4788070d25d4a75 Author: Guilherme Amadio gentoo org> AuthorDate: Thu Nov 11 08:49:02 2021 + Commit: Guilherme Amadio gentoo org> CommitDate: Thu Nov 11 08:51:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322b4e15 dev-util/perf: support LLVM >= 10, bug #735752 Closes: https://bugs.gentoo.org/735752 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Guilherme Amadio gentoo.org> dev-util/perf/files/perf-5.15-clang.patch | 231 + .../perf/{perf-5.15.ebuild => perf-5.15-r1.ebuild} | 16 +- 2 files changed, 241 insertions(+), 6 deletions(-) diff --git a/dev-util/perf/files/perf-5.15-clang.patch b/dev-util/perf/files/perf-5.15-clang.patch new file mode 100644 index 000..5ea0c75f27f --- /dev/null +++ b/dev-util/perf/files/perf-5.15-clang.patch @@ -0,0 +1,231 @@ +From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001 +From: Ian Rogers +Date: Mon, 11 Oct 2021 19:13:20 -0700 +Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14 + +LLVM 9 (current release is LLVM 13) moved the minimum C++ version to +GNU++14. Bump the version numbers in the feature test and perf build. + +Reviewed-by: Fangrui Song +Signed-off-by: Ian Rogers +Cc: Alexander Shishkin +Cc: Daniel Borkmann +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Leo Yan +Cc: Mark Rutland +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Peter Zijlstra +Cc: Sedat Dilek +Cc: l...@lists.linux.dev +Link: https://lore.kernel.org/r/20211012021321.291635-1-irog...@google.com +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/build/feature/Makefile | 6 +++--- + tools/perf/Makefile.config | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile +index eff55d287db1..9756e589e4ae 100644 +--- a/tools/build/feature/Makefile b/tools/build/feature/Makefile +@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin: + $(BUILD) + + $(OUTPUT)test-llvm.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + $(shell $(LLVM_CONFIG) --libs Core BPF) \ +@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin: + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-llvm-version.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-clang.bin: +- $(BUILDXX) -std=gnu++11 \ ++ $(BUILDXX) -std=gnu++14 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + -Wl,--start-group -lclangBasic -lclangDriver\ +diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config +index 14e3e8d702a0..ddbe86defe39 100644 +--- a/tools/perf/Makefile.config b/tools/perf/Makefile.config +@@ -285,7 +285,7 @@ CORE_CFLAGS += -Wall + CORE_CFLAGS += -Wextra + CORE_CFLAGS += -std=gnu99 + +-CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti ++CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti + CXXFLAGS += -Wall + CXXFLAGS += -fno-omit-frame-pointer + CXXFLAGS += -ggdb3 +-- +2.33.1 + + +From 3e5c11995e04a9e3351330c34c4c802ce50df46c Mon Sep 17 00:00:00 2001 +From: Ian Rogers +Date: Mon, 11 Oct 2021 19:13:21 -0700 +Subject: [PATCH 2/3] perf clang: Fixes for more recent LLVM/clang + +The parameters to two functions and the location of a variable have +changed in more recent LLVM/clang releases. + +Remove the unneecessary -fmessage-length and -ferror-limit flags, the +former causes failures like: + + 58: builtin clang support : + 58.1: builtin clang compile C source to IR : + --- start --- + test child forked, pid 279307 + error: unknown argument: '-fmessage-length' + 1 error generated. + test child finished with -1 + +Tested with LLVM 6, 8, 9, 10 and 11. + +Reviewed-by: Fangrui Song +Signed-off-by: Ian Rogers +Cc: Alexander Shishkin +Cc: Daniel Borkmann +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Leo Yan +Cc: Mark Rutland +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Peter Zijlstra +Cc: Sedat Dilek , +Cc: l...@lists.linux.dev +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/util/c++/clang.cpp | 21 + + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp +index
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/
commit: b0e6a7dc74c51984376d4f0a70087ce0d7c26eeb Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Feb 18 16:56:52 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu Feb 18 23:02:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e6a7dc dev-util/perf: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/19521 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> dev-util/perf/files/perf-5.1.15-fix-clang8.patch | 17 -- .../perf/files/perf-5.4.20-binutil-libs-2.34.patch | 60 -- dev-util/perf/files/perf-5.4.6-fix-clang9.patch| 17 -- .../perf/files/perf-5.4.7-propagate-cflags.patch | 44 4 files changed, 138 deletions(-) diff --git a/dev-util/perf/files/perf-5.1.15-fix-clang8.patch b/dev-util/perf/files/perf-5.1.15-fix-clang8.patch deleted file mode 100644 index 743f4b017b1..000 --- a/dev-util/perf/files/perf-5.1.15-fix-clang8.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/678652 -Created-By: Maciej S. Szmigiero a/tools/build/feature/test-clang.cpp 2018-12-24 00:55:59.0 +0100 -+++ b/tools/build/feature/test-clang.cpp 2019-04-06 16:05:56.828757243 +0200 -@@ -1,10 +1,10 @@ - // SPDX-License-Identifier: GPL-2.0 --#include "clang/Basic/VirtualFileSystem.h" - #include "clang/Driver/Driver.h" - #include "clang/Frontend/TextDiagnosticPrinter.h" - #include "llvm/ADT/IntrusiveRefCntPtr.h" - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" -+#include "llvm/Support/VirtualFileSystem.h" - - using namespace clang; - using namespace clang::driver; diff --git a/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch b/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch deleted file mode 100644 index 9fa191f720a..000 --- a/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_ since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Signed-off-by: Changbin Du -Acked-by: Jiri Olsa -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin...@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo - tools/perf/util/srcline.c | 16 +++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6..5b7d6c1 100644 a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; --- -cgit v1.1 - diff --git a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch deleted file mode 100644 index 614e62f676d..000 --- a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/695726 -Created-By: Maciej S. Szmigiero -Created-By: Dennis Schridde a/tools/perf/util/c++/clang.cpp.orig 2019-12-20 16:39:21.015363866 +0100 -+++ b/tools/perf/util/c++/clang.cpp2019-12-20 16:40:04.051639185 +0100 -@@ -71,7 +71,11 @@ - CompilerInstance Clang; - Clang.createDiagnostics(); - -+#if CLANG_VERSION_MAJOR < 9 - Clang.setVirtualFileSystem(&*VFS); -+#else -+ Clang.createFileManager(&*VFS); -+#endif - - #if CLANG_VERSION_MAJOR < 4 - IntrusiveRefCntPtr CI = diff --git a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch deleted file mode 100644 index b1a9bcc25a1..000 ---
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/
commit: 95244db839bb931271d1b430c0b39ef482e6b0f5 Author: Yixun Lan gentoo org> AuthorDate: Sat Feb 15 16:01:22 2020 + Commit: Yixun Lan gentoo org> CommitDate: Sat Feb 15 16:04:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95244db8 dev-util/perf: make perf build with both old and new libbfd patch from upstream, this would make it build with binutils-2.34 again Closes: https://bugs.gentoo.org/707830 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Yixun Lan gentoo.org> dev-util/perf/Manifest | 1 + .../perf/files/perf-5.4.20-binutil-libs-2.34.patch | 60 + dev-util/perf/perf-5.4.20.ebuild | 246 + 3 files changed, 307 insertions(+) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index 11d1946d67e..38f95eb78e3 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -5,4 +5,5 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6 +DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77 DIST patch-5.4.7.xz 272092 BLAKE2B dc9e1cede993144a4d9cb17cb91d3857b6492fa1a971c743268afdc601edfafb033abc3ac24cb7789d3f171ea7fb6b60ad5197da445ab72f5e9cf2ae00e7f495 SHA512 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161 diff --git a/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch b/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch new file mode 100644 index 000..9fa191f720a --- /dev/null +++ b/dev-util/perf/files/perf-5.4.20-binutil-libs-2.34.patch @@ -0,0 +1,60 @@ +From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 +From: Changbin Du +Date: Tue, 28 Jan 2020 23:29:38 +0800 +Subject: perf: Make perf able to build with latest libbfd + +libbfd has changed the bfd_section_* macros to inline functions +bfd_section_ since 2019-09-18. See below two commits: + o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html + o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html + +This fix make perf able to build with both old and new libbfd. + +Signed-off-by: Changbin Du +Acked-by: Jiri Olsa +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin...@gmail.com +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/util/srcline.c | 16 +++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c +index 6ccf6f6..5b7d6c1 100644 +--- a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c +@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) + bfd_vma pc, vma; + bfd_size_type size; + struct a2l_data *a2l = data; ++ flagword flags; + + if (a2l->found) + return; + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++#ifdef bfd_get_section_flags ++ flags = bfd_get_section_flags(abfd, section); ++#else ++ flags = bfd_section_flags(section); ++#endif ++ if ((flags & SEC_ALLOC) == 0) + return; + + pc = a2l->addr; ++#ifdef bfd_get_section_vma + vma = bfd_get_section_vma(abfd, section); ++#else ++ vma = bfd_section_vma(section); ++#endif ++#ifdef bfd_get_section_size + size = bfd_get_section_size(section); ++#else ++ size = bfd_section_size(section); ++#endif + + if (pc < vma || pc >= vma + size) + return; +-- +cgit v1.1 + diff --git a/dev-util/perf/perf-5.4.20.ebuild b/dev-util/perf/perf-5.4.20.ebuild new file mode 100644 index 000..3075642225a --- /dev/null +++ b/dev-util/perf/perf-5.4.20.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2020 Gentoo Authors +#
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/
commit: 2f0984a4ca63a39961bf113bb2b7bdbfe0442ea8 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jan 5 02:01:53 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jan 5 02:03:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0984a4 dev-util/perf: add missing patch for 5.4.7 Closes: https://bugs.gentoo.org/704798 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> .../perf/files/perf-5.4.7-propagate-cflags.patch | 44 ++ 1 file changed, 44 insertions(+) diff --git a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch new file mode 100644 index 000..b1a9bcc25a1 --- /dev/null +++ b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch @@ -0,0 +1,44 @@ +From 55542113c690a567e728e40d4181d7d037fc21b0 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Fri, 11 Oct 2019 14:21:55 +0200 +Subject: perf tools: Propagate CFLAGS to libperf + +Andi reported that 'make DEBUG=1' does not propagate to the libbperf +code. It's true also for the other flags. Changing the code to propagate +the global build flags to libperf compilation. + +Reported-by: Andi Kleen +Signed-off-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20191011122155.15738-1-jo...@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/lib/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +(limited to 'tools/perf/lib/core.c') + +diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c +index d0b9ae422b9f..58fc894b76c5 100644 +--- a/tools/perf/lib/core.c b/tools/perf/lib/core.c +@@ -5,11 +5,12 @@ + #include + #include + #include ++#include + #include + #include + #include "internal.h" + +-static int __base_pr(enum libperf_print_level level, const char *format, ++static int __base_pr(enum libperf_print_level level __maybe_unused, const char *format, +va_list args) + { + return vfprintf(stderr, format, args); +-- +cgit 1.2-0.3.lf.el7 +
[gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/
commit: d1c490b9c9c522f663e841e4a59baabdac8f5c45 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Mar 3 15:57:42 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 4 03:10:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c490b9 dev-util/perf: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11236 Signed-off-by: Aaron Bauman gentoo.org> dev-util/perf/files/perf-4.1.5-prefix.patch | 43 - 1 file changed, 43 deletions(-) diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch deleted file mode 100644 index 0c4dff01130..000 --- a/dev-util/perf/files/perf-4.1.5-prefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 75e84ab906ef8935cff3df3d8929f1bafea81599 -Author: Lukas Wunner -Date: Thu Jun 18 13:00:32 2015 +0200 - -perf tools: Fix build breakage if prefix= is specified - -Invoking Makefile.perf with prefix= breaks the build since Makefile.perf -hands that variable down to Makefile.build where it overrides - -prefix := $(subst ./,,$(OUTPUT)$(dir)/) - -leading to errors like this: - -No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o' - -Signed-off-by: Lukas Wunner -Acked-by: Jiri Olsa -Cc: David Ahern -Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 -Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285smtpin_added_miss...@mx.google.com -Signed-off-by: Arnaldo Carvalho de Melo - -diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build -index 10df572..98cfc38 100644 a/tools/build/Makefile.build -+++ b/tools/build/Makefile.build -@@ -94,12 +94,12 @@ obj-y:= $(patsubst %/, %/$(obj)-in.o, $(obj-y)) - subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) - - # '$(OUTPUT)/dir' prefix to all objects --prefix := $(subst ./,,$(OUTPUT)$(dir)/) --obj-y:= $(addprefix $(prefix),$(obj-y)) --subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) -+objprefix:= $(subst ./,,$(OUTPUT)$(dir)/) -+obj-y:= $(addprefix $(objprefix),$(obj-y)) -+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) - - # Final '$(obj)-in.o' object --in-target := $(prefix)$(obj)-in.o -+in-target := $(objprefix)$(obj)-in.o - - PHONY += $(subdir-y) -