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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2A18138359 for ; Wed, 26 Aug 2020 23:35:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC655E0BFA; Wed, 26 Aug 2020 23:35:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA91CE0BFA for ; Wed, 26 Aug 2020 23:35:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BAA8335D4E for ; Wed, 26 Aug 2020 23:35:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C97532FC for ; Wed, 26 Aug 2020 23:35:08 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1598484884.976dd88af1c35afbd35d0285aef61f7fc8376f6d.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild X-VCS-Directories: sys-fs/zfs-kmod/files/ sys-fs/zfs-kmod/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 976dd88af1c35afbd35d0285aef61f7fc8376f6d X-VCS-Branch: master Date: Wed, 26 Aug 2020 23:35:08 +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: 4acab653-5b6f-4597-bd39-cc670b90cc8b X-Archives-Hash: 23801a9c2a6c7b6333962aa2e2a1d532 commit: 976dd88af1c35afbd35d0285aef61f7fc8376f6d Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Aug 26 23:12:24 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Aug 26 23:34:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976dd88a sys-fs/zfs-kmod: apply znver build failure workaround Bug: https://bugs.gentoo.org/738270 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch | 29 ++++++++++++++++++++++++++ sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch b/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch new file mode 100644 index 00000000000..9e9a007c300 --- /dev/null +++ b/sys-fs/zfs-kmod/files/2.0.0_rc1-U__BMI__.patch @@ -0,0 +1,29 @@ +From 81a3970fca5759499effc3131e59c9bd8f446cc9 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Wed, 26 Aug 2020 16:02:48 -0700 +Subject: [PATCH] module/zstd: pass -U__BMI__ + +Closes: https://github.com/openzfs/zfs/issues/10758 +Signed-off-by: Georgy Yakovlev +--- + module/zstd/Makefile.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/module/zstd/Makefile.in b/module/zstd/Makefile.in +index eea749ea8..bfceca920 100644 +--- a/module/zstd/Makefile.in ++++ b/module/zstd/Makefile.in +@@ -20,6 +20,10 @@ ccflags-y += -O3 + # Set it for other compilers, too. + $(obj)/lib/zstd.o: c_flags += -fno-tree-vectorize + ++# SSE register return with SSE disabled if -march=znverX is passed ++# https://github.com/openzfs/zfs/issues/10758 ++$(obj)/lib/zstd.o: c_flags += -U__BMI__ ++ + # Quiet warnings about frame size due to unused code in unmodified zstd lib + $(obj)/lib/zstd.o: c_flags += -Wframe-larger-than=20480 + +-- +2.28.0 + diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild index e475ec25736..6acf1aa1679 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc1.ebuild @@ -38,6 +38,8 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +PATCHES=( "${FILESDIR}/${PV}-U__BMI__.patch" ) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC