From f4cbbfeb8e2f485761bd37280ee614cab268e323 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 4 Mar 2022 09:38:14 +0200 Subject: [PATCH] qtbase: remove merged patches Change-Id: I455262b28b964d7933ed2883baac07056540ac87 Reviewed-by: Mikko Gronoff --- ...ng-for-i386-after-add-support-for-VA.patch | 30 ----- ...imd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch | 112 ------------------ recipes-qt/qt6/qtbase_git.bb | 2 - 3 files changed, 144 deletions(-) delete mode 100644 recipes-qt/qt6/qtbase/0001-QHash-Fix-building-for-i386-after-add-support-for-VA.patch delete mode 100644 recipes-qt/qt6/qtbase/0001-qsimd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch diff --git a/recipes-qt/qt6/qtbase/0001-QHash-Fix-building-for-i386-after-add-support-for-VA.patch b/recipes-qt/qt6/qtbase/0001-QHash-Fix-building-for-i386-after-add-support-for-VA.patch deleted file mode 100644 index e5c5a1d..0000000 --- a/recipes-qt/qt6/qtbase/0001-QHash-Fix-building-for-i386-after-add-support-for-VA.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7341251e0ece7e202e3b5fb02fec6b17d61304c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Wed, 23 Feb 2022 11:41:31 +0200 -Subject: [PATCH] QHash: Fix building for i386 after "add support for VAES and - AVX512VL" - -Fix a typo from da1720485eee265c40b3832dc92c19100891d86f, -where mm_cvtsz_si128 was undefined when building for a 32 bit -target. The code would make it seem this was a typo, with the -listing of defines didn't match between 32 and 64 bit. - -Change-Id: Ica24d88e7f71ecd1d24ed990773711f9105f3ec8 -Reviewed-by: Allan Sandfeld Jensen ---- - src/corelib/tools/qhash.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp -index c69b5123d8..e3106745da 100644 ---- a/src/corelib/tools/qhash.cpp -+++ b/src/corelib/tools/qhash.cpp -@@ -525,7 +525,7 @@ static uint siphash(const uint8_t *in, uint inlen, uint seed, uint seed2) - # define mm256_set1_epz _mm256_set1_epi64x - # else - # define mm_set1_epz _mm_set1_epi32 --# define mm_cvtepz_si128 _mm_cvtsi32_si128 -+# define mm_cvtsz_si128 _mm_cvtsi32_si128 - # define mm_cvtsi128_sz _mm_cvtsi128_si32 - # define mm256_set1_epz _mm256_set1_epi32 - # endif diff --git a/recipes-qt/qt6/qtbase/0001-qsimd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch b/recipes-qt/qt6/qtbase/0001-qsimd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch deleted file mode 100644 index f3637a6..0000000 --- a/recipes-qt/qt6/qtbase/0001-qsimd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 48fd6a9af481ebd499f2fb1abdd7cf69383ed246 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Wed, 23 Feb 2022 12:01:47 -0800 -Subject: [PATCH] qsimd.cpp: fix _FORTIFY_SOURCE=2 builds - -That option makes printf() and some other functions become always_inline -functions with extent checking. Unfortunately, that also means GCC fails -to inline them when we're not compiling for the same target as -X86_BASELINE. So we have to force all other includes but qsimd_p.h to be -the baseline too. - -Fixes: QTBUG-101198 -Change-Id: Ibf4acec0f166495998f7fffd16d685d537d9e409 ---- - src/corelib/CMakeLists.txt | 1 + - src/corelib/global/qsimd.cpp | 47 ++++++++++++++++++++++++------------ - 2 files changed, 32 insertions(+), 16 deletions(-) - -diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index ffd22d6884..89abd8d863 100644 ---- a/src/corelib/CMakeLists.txt -+++ b/src/corelib/CMakeLists.txt -@@ -287,6 +287,7 @@ _qt_internal_setup_deploy_support() - - set(corelib_no_pch_sources - compat/removed_api.cpp -+ global/qsimd.cpp - ) - - foreach(src ${corelib_no_pch_sources}) -diff --git a/src/corelib/global/qsimd.cpp b/src/corelib/global/qsimd.cpp -index d2a0686097..8c19c5bb0e 100644 ---- a/src/corelib/global/qsimd.cpp -+++ b/src/corelib/global/qsimd.cpp -@@ -38,10 +38,31 @@ - ** - ****************************************************************************/ - --// we need ICC to define the prototype for _rdseed64_step --#define __INTEL_COMPILER_USE_INTRINSIC_PROTOTYPES -+#define QT_DO_PRAGMA(text) _Pragma(#text) -+#if defined(__clang__) -+# define QT_PRAGMA_PUSH_TARGET(tgt) QT_DO_PRAGMA(clang attribute push(__attribute__((target(tgt))), apply_to=function)) -+# define QT_PRAGMA_POP_TARGET QT_DO_PRAGMA(clang attribute pop) -+#elif defined(__GNUC__) -+# define QT_PRAGMA_PUSH_TARGET(tgt) QT_DO_PRAGMA(GCC push_options) QT_DO_PRAGMA(GCC target(tgt)) -+# define QT_PRAGMA_POP_TARGET QT_DO_PRAGMA(GCC pop_options) -+#else -+# define QT_PRAGMA_PUSH_TARGET(tgt) -+# define QT_PRAGMA_POP_TARGET -+#endif - --#include "qsimd_p.h" -+#if defined(__SSE2_MATH__) -+# define QT_FUNCTION_TARGET_BASELINE __attribute__((target("no-sse3"))) -+# define QT_FUNCTION_TARGET_STRING_BASELINE_RDRND "no-sse3," QT_FUNCTION_TARGET_STRING_RDRND -+QT_PRAGMA_PUSH_TARGET("no-sse3") -+#elif defined(__i386__) -+# define QT_FUNCTION_TARGET_BASELINE __attribute__((target("no-sse"))) -+# define QT_FUNCTION_TARGET_STRING_BASELINE_RDRND "no-sse," QT_FUNCTION_TARGET_STRING_RDRND -+QT_PRAGMA_PUSH_TARGET("no-sse") -+#else -+# define QT_FUNCTION_TARGET_BASELINE -+#endif -+ -+#include "qglobal_p.h" - #include "qalgorithms.h" - #include - #include -@@ -55,8 +76,6 @@ - # include "../testlib/3rdparty/valgrind_p.h" - #endif - --#define QT_FUNCTION_TARGET_BASELINE -- - #if defined(Q_OS_WIN) - # if !defined(Q_CC_GNU) - # include -@@ -94,6 +113,13 @@ - # include - #endif - -+#if defined(__SSE2_MATH__) || defined(__i386__) -+QT_PRAGMA_POP_TARGET -+#endif -+ -+// Our header comes LAST, after the pragma above -+#include "qsimd_p.h" -+ - QT_BEGIN_NAMESPACE - - #if defined(Q_PROCESSOR_ARM) -@@ -199,19 +225,8 @@ static inline quint64 detectProcessorFeatures() - - #ifdef Q_PROCESSOR_X86_32 - # define PICreg "%%ebx" --# define X86_BASELINE "i386" - #else - # define PICreg "%%rbx" --# define X86_BASELINE "x86-64" --#endif -- --#if defined(Q_CC_GNU) --// lower the target for functions in this file --# undef QT_FUNCTION_TARGET_BASELINE --# define QT_FUNCTION_TARGET_BASELINE __attribute__((target("arch=" X86_BASELINE))) --# define QT_FUNCTION_TARGET_STRING_BASELINE_RDRND \ -- "arch=" X86_BASELINE \ -- "," QT_FUNCTION_TARGET_STRING_RDRND - #endif - - static bool checkRdrndWorks() noexcept; diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index e5c4edf..8d1d067 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -19,8 +19,6 @@ SRC_URI += "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-tests-disable-failing-tests.patch \ file://0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch \ - file://0001-qsimd.cpp-fix-_FORTIFY_SOURCE-2-builds.patch \ - file://0001-QHash-Fix-building-for-i386-after-add-support-for-VA.patch \ " DEPENDS += "\