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 5C1D0158041 for ; Mon, 4 Mar 2024 10:05:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6945FE2A0C; Mon, 4 Mar 2024 10:05:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 330B1E2A0C for ; Mon, 4 Mar 2024 10:05:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40F39340806 for ; Mon, 4 Mar 2024 10:05:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0587A119 for ; Mon, 4 Mar 2024 10:05:48 +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: <1709546737.97ebdf452e739583cb3f1d5cbcff6bb145811e2a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/files/, app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild X-VCS-Directories: app-arch/xz-utils/files/ app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 97ebdf452e739583cb3f1d5cbcff6bb145811e2a X-VCS-Branch: master Date: Mon, 4 Mar 2024 10:05:48 +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: 92ba691d-489a-401b-807f-65fce214935f X-Archives-Hash: 994bba7f81f760d130a350ba5e498541 commit: 97ebdf452e739583cb3f1d5cbcff6bb145811e2a Author: Sam James gentoo org> AuthorDate: Mon Mar 4 10:03:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 4 10:05:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ebdf45 app-arch/xz-utils: workaround USE=pgo build failure Workaround a build failure with USE=pgo by disabling instrumentation of the crc{32,64} IFUNC resolvers. No revbump as it shouldn't affect runtime at all - instrumentation would kill it immediately if at all, it's not an issue from the profiled binaries, just the instrumentation to profile them. Bug: https://gcc.gnu.org/PR114115 Closes: https://bugs.gentoo.org/925415 Signed-off-by: Sam James gentoo.org> .../xz-utils-5.6.0-ifunc-crc-workaround.patch | 27 ++++++++++++++++++++++ app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch b/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch new file mode 100644 index 000000000000..e793aac56a78 --- /dev/null +++ b/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/925415 +https://gcc.gnu.org/PR114115 + +Workaround a build failure with USE=pgo by disabling instrumentation of the +crc{32,64} IFUNC resolvers. +--- a/src/liblzma/check/crc32_fast.c ++++ b/src/liblzma/check/crc32_fast.c +@@ -135,7 +135,7 @@ typedef uint32_t (*crc32_func_type)( + // This resolver is shared between all three dispatch methods. It serves as + // the ifunc resolver if ifunc is supported, otherwise it is called as a + // regular function by the constructor or first call resolution methods. +-static crc32_func_type ++static __attribute__((no_profile_instrument_function)) crc32_func_type + crc32_resolve(void) + { + return is_arch_extension_supported() +--- a/src/liblzma/check/crc64_fast.c ++++ b/src/liblzma/check/crc64_fast.c +@@ -98,7 +98,7 @@ typedef uint64_t (*crc64_func_type)( + # pragma GCC diagnostic ignored "-Wunused-function" + #endif + +-static crc64_func_type ++static __attribute__((no_profile_instrument_function)) crc64_func_type + crc64_resolve(void) + { + return is_arch_extension_supported() diff --git a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild index 26708cb6aea1..7260487c61d5 100644 --- a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild @@ -55,6 +55,7 @@ fi PATCHES=( "${FILESDIR}"/${P}-logging-verbosity-threads-auto.patch + "${FILESDIR}"/${PN}-5.6.0-ifunc-crc-workaround.patch ) src_prepare() {