From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8456A158004 for ; Thu, 28 Dec 2023 02:59:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F271B2BC09F; Thu, 28 Dec 2023 02:57:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 803542BC09F for ; Thu, 28 Dec 2023 02:57:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96C6B33FEF1 for ; Thu, 28 Dec 2023 02:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CEA51441 for ; Thu, 28 Dec 2023 02:57:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1703732109.cafbbb74da16b630715015956cbaa62f1722008b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/perf/perf-6.3.ebuild dev-util/perf/perf-6.5.ebuild dev-util/perf/perf-6.6.ebuild X-VCS-Directories: dev-util/perf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cafbbb74da16b630715015956cbaa62f1722008b X-VCS-Branch: master Date: Thu, 28 Dec 2023 02:57:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b752c81-074b-4f9e-a28c-9c00144f6647 X-Archives-Hash: 6e892b86e66bb7872420bbdca3155261 commit: cafbbb74da16b630715015956cbaa62f1722008b Author: Matoro Mahri matoro tk> AuthorDate: Tue Dec 19 22:50:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 28 02:55:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafbbb74 dev-util/perf: mirror kernel restrictions for libdw support Kernel has a whitelist of architectures for which unwind via libdw is supported. Right now the ebuild unconditionally enables it, this fails on architectures where kernel support is not merged (e.g. alpha). This list needs to be checked and synced on updates. There shouldn't be anything removed from it in the future, only added. Bug: https://bugs.gentoo.org/759754 Signed-off-by: Matoro Mahri matoro.tk> Closes: https://github.com/gentoo/gentoo/pull/34376 Signed-off-by: Sam James gentoo.org> dev-util/perf/perf-6.3.ebuild | 15 ++++++++++++++- dev-util/perf/perf-6.5.ebuild | 16 +++++++++++++++- dev-util/perf/perf-6.6.ebuild | 16 +++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild index 7969607f7994..e3f009470d74 100644 --- a/dev-util/perf/perf-6.3.ebuild +++ b/dev-util/perf/perf-6.3.ebuild @@ -179,6 +179,19 @@ perf_make() { local arch=$(tc-arch-kernel) local java_dir use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" + + # sync this with the whitelist in tools/perf/Makefile.config + local disable_libdw + if ! use amd64 && ! use x86 && \ + ! use arm && \ + ! use arm64 && \ + ! use ppc && ! use ppc64 \ + ! use s390 && \ + ! use riscv + then + disable_libdw=1 + fi + # FIXME: NO_CORESIGHT emake V=1 VF=1 \ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ @@ -204,7 +217,7 @@ perf_make() { NO_LIBBIONIC=1 \ NO_LIBBPF= \ NO_LIBCRYPTO=$(puse crypt) \ - NO_LIBDW_DWARF_UNWIND= \ + NO_LIBDW_DWARF_UNWIND="${disable_libdw}" \ NO_LIBELF= \ NO_LIBNUMA=$(puse numa) \ NO_LIBPERL=$(puse perl) \ diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild index 63a36103e1f1..128f4fd8b60a 100644 --- a/dev-util/perf/perf-6.5.ebuild +++ b/dev-util/perf/perf-6.5.ebuild @@ -212,6 +212,20 @@ perf_make() { local arch=$(tc-arch-kernel) local java_dir use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" + + # sync this with the whitelist in tools/perf/Makefile.config + local disable_libdw + if ! use amd64 && ! use x86 && \ + ! use arm && \ + ! use arm64 && \ + ! use ppc && ! use ppc64 \ + ! use s390 && \ + ! use riscv && \ + ! use loong + then + disable_libdw=1 + fi + # FIXME: NO_CORESIGHT local emakeargs=( V=1 VF=1 @@ -241,7 +255,7 @@ perf_make() { NO_LIBBPF=$(puse bpf) NO_LIBCAP=$(puse caps) NO_LIBCRYPTO=$(puse crypt) - NO_LIBDW_DWARF_UNWIND= + NO_LIBDW_DWARF_UNWIND="${disable_libdw}" NO_LIBELF= NO_LIBNUMA=$(puse numa) NO_LIBPERL=$(puse perl) diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild index b86fbd604b85..762843d662bf 100644 --- a/dev-util/perf/perf-6.6.ebuild +++ b/dev-util/perf/perf-6.6.ebuild @@ -209,6 +209,20 @@ perf_make() { local arch=$(tc-arch-kernel) local java_dir use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" + + # sync this with the whitelist in tools/perf/Makefile.config + local disable_libdw + if ! use amd64 && ! use x86 && \ + ! use arm && \ + ! use arm64 && \ + ! use ppc && ! use ppc64 \ + ! use s390 && \ + ! use riscv && \ + ! use loong + then + disable_libdw=1 + fi + # FIXME: NO_CORESIGHT local emakeargs=( V=1 VF=1 @@ -237,7 +251,7 @@ perf_make() { NO_LIBBPF=$(puse bpf) NO_LIBCAP=$(puse caps) NO_LIBCRYPTO=$(puse crypt) - NO_LIBDW_DWARF_UNWIND= + NO_LIBDW_DWARF_UNWIND="${disable_libdw}" NO_LIBELF= NO_LIBNUMA=$(puse numa) NO_LIBPERL=$(puse perl)