[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

[Georgy Yakovlev]

commit:     976dd88af1c35afbd35d0285aef61f7fc8376f6d
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 23:12:24 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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 <gyakovlev@g.o>
+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 <gyakovlev@g.o>
+---
+ 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