qemu-usermode: try disabling AVX2 since it causes issues on obs.

[qemu-usermode] try disabling AVX2 since it causes issues on obs. JB#51953
sailfishos · Dec 8, 2020 · 5b79b7f · 5b79b7f
1 parent bd53bdc
commit 5b79b7f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/rpm/0001-Force-AVX2-off.patch b/rpm/0001-Force-AVX2-off.patch
@@ -0,0 +1,25 @@
+From a7664b7bd52483826d0bd47b6a9b3394e6f6f1c6 Mon Sep 17 00:00:00 2001
+From: Frajo Haider <f_haider@gmx.at>
+Date: Mon, 7 Dec 2020 14:22:26 +0000
+Subject: [PATCH 1/1] Force AVX2 off
+
+---
+ tcg/i386/tcg-target.inc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
+index ae0228238b..7c4a83affc 100644
+--- a/tcg/i386/tcg-target.inc.c
++++ b/tcg/i386/tcg-target.inc.c
+@@ -3895,7 +3895,7 @@ static void tcg_target_init(TCGContext *s)
+             asm(".byte 0x0f, 0x01, 0xd0" : "=a" (xcrl), "=d" (xcrh) : "c" (0));
+             if ((xcrl & 6) == 6) {
+                 have_avx1 = (c & bit_AVX) != 0;
+-                have_avx2 = (b7 & bit_AVX2) != 0;
++                have_avx2 = false;//have_avx2 = (b7 & bit_AVX2) != 0;
+             }
+         }
+     }
+-- 
+2.26.2
+
diff --git a/rpm/qemu-usermode.spec b/rpm/qemu-usermode.spec
@@ -21,12 +21,12 @@ Patch5: 0007-Revert-linux-user-Use-direct-syscall-for-utimensat.patch
 # fix for "kill -INT", etc. on qemu emulated binaries, e.g. ninja_test
 Patch6: 0009-linux-user-Also-ignore-attempts-to-block-SIGTERM-SIG.patch
 # crash fixes for qemu 4.2.0
-Patch7: 0010-Revert-tcg-i386-Fix-dupi-dupm-for-avx1-and-32-bit-ho.patch
-Patch8: 0011-Revert-tcg-i386-Implement-tcg_out_dupm_vec.patch
+#Patch7: 0010-Revert-tcg-i386-Fix-dupi-dupm-for-avx1-and-32-bit-ho.patch
+#Patch8: 0011-Revert-tcg-i386-Implement-tcg_out_dupm_vec.patch
 # For obs getting stuck in getrandom
 Patch9: 0013-crypto-check-if-getrandom-is-available-properly.patch
 # fix libgcyrpt basic test with 4.2.0 (and probably other failures)
-Patch10: 0014-Revert-tcg-Add-INDEX_op_dupm_vec.patch
+#Patch10: 0014-Revert-tcg-Add-INDEX_op_dupm_vec.patch
 # fix openat syscall (breaks e.g. bc build)
 Patch11: 0015-make-sure-mode-is-passed-to-openat-if-O_TMPFILE-is-s.patch
 # make sure utimensat from glibc is being used (see sb2 fixes above)
@@ -43,6 +43,8 @@ Patch14: 0018-linux-user-Support-f_flags-in-statfs64-when-availabl.patch
 # Test patch to revert init_guest_commpage error
 Patch18: 0022-Revert-linux-user-completely-re-write-init_guest_spa.patch
 
+Patch19: 0001-Force-AVX2-off.patch
+
 BuildRequires:  pkgconfig(ext2fs)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(zlib)