summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2022-09-30 09:39:11 +0200
committerTreeve Jelbert2022-09-30 09:39:11 +0200
commit66a4fb9e1b6c8c2f72c12027507e28b46df2859b (patch)
tree0cb5ec6c1ff5c70f11bed3cb35cd2a8d549405b0
parent73439f7e33fa06e29c9a5808a981d9faec2b9735 (diff)
qt6base - add upstream patch
-rw-r--r--qt6/qt6base/HISTORY3
-rw-r--r--qt6/qt6base/patches/qsimd.patch16
2 files changed, 19 insertions, 0 deletions
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 761134eb08..83361f43d8 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,6 @@
+2022-09-30 Treeve Jelbert <treeve@sourcemage.org>
+ * patches/qsimd.patch: added - fix compile on haswell/amd
+
2022-09-29 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.4.0
diff --git a/qt6/qt6base/patches/qsimd.patch b/qt6/qt6base/patches/qsimd.patch
new file mode 100644
index 0000000000..51115096dd
--- /dev/null
+++ b/qt6/qt6base/patches/qsimd.patch
@@ -0,0 +1,16 @@
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index 1feedbbb238b61f8285381f7941de384863de46d..fac49d142a968e0daf73339a442d140369dc0658 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -211,9 +211,9 @@ asm(
+ //
+ // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
+ // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell).
+-# define ARCH_HASWELL_MACROS (__AVX2__ + __BMI__ + __BMI2__ + __F16C__ + __FMA__ + __LZCNT__)
++# define ARCH_HASWELL_MACROS (__AVX2__ + __BMI__ + __BMI2__ + __FMA__ + __LZCNT__)
+ # if ARCH_HASWELL_MACROS != 0
+-# if ARCH_HASWELL_MACROS != 6
++# if ARCH_HASWELL_MACROS != 5
+ # error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2"
+ # endif
+ static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing.");