diff options
author | Treeve Jelbert | 2022-11-15 09:18:00 +0100 |
---|---|---|
committer | Treeve Jelbert | 2022-11-15 09:18:00 +0100 |
commit | e73662acfe260242c46650a2e891ff38fbf6dc71 (patch) | |
tree | c2bbe015324b95f8ba028cba030fbe928e5cf4ad /qt6 | |
parent | 940c4de3f34e627fbce8a9284ca69c43e07e3e41 (diff) |
qt6base - delete qsimd patch
Diffstat (limited to 'qt6')
-rw-r--r-- | qt6/qt6base/HISTORY | 3 | ||||
-rw-r--r-- | qt6/qt6base/patches/qsimd.patch | 16 |
2 files changed, 3 insertions, 16 deletions
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY index 83361f43d8..931f4d9e7c 100644 --- a/qt6/qt6base/HISTORY +++ b/qt6/qt6base/HISTORY @@ -1,3 +1,6 @@ +2022-11-15 Treeve Jelbert <treeve@sourcemage.org> + * patches/qsimd.patch: deleted + 2022-09-30 Treeve Jelbert <treeve@sourcemage.org> * patches/qsimd.patch: added - fix compile on haswell/amd diff --git a/qt6/qt6base/patches/qsimd.patch b/qt6/qt6base/patches/qsimd.patch deleted file mode 100644 index 51115096dd..0000000000 --- a/qt6/qt6base/patches/qsimd.patch +++ /dev/null @@ -1,16 +0,0 @@ -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."); |