From cc83cdff95d8f2759052a4ba752cfaa32556f827 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 16 Jul 2022 05:30:01 +0300 Subject: [PATCH] Don't use yield on armel where the baseline does not support it --- debian/patches/armel-noyield.patch | 14 ++++++++++++++ debian/patches/series | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 debian/patches/armel-noyield.patch diff --git a/debian/patches/armel-noyield.patch b/debian/patches/armel-noyield.patch new file mode 100644 index 0000000..5b39b5d --- /dev/null +++ b/debian/patches/armel-noyield.patch @@ -0,0 +1,14 @@ +Description: Don't use yield on CPUs that might not support it + +--- qt6-base-6.3.1+dfsg.orig/src/corelib/global/qsimd_p.h ++++ qt6-base-6.3.1+dfsg/src/corelib/global/qsimd_p.h +@@ -428,7 +428,9 @@ static inline void qYieldCpu() + https://stackoverflow.com/a/70076751/134841 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105416 + */ ++# if !defined(Q_CC_GNU) || (__ARM_ARCH >= 7) + asm volatile("yield"); /* this works everywhere */ ++# endif + # else + __yield(); /* this is what should work everywhere */ + # endif diff --git a/debian/patches/series b/debian/patches/series index 37f81df..5a1f9b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,5 @@ upstream_QFileSystemEngine-canonicalName-Unix-clean-up-contro.patch # Debian specific remove_privacy_breaches.diff build_path_embedded_qtbuildinternalsextra_cmake.patch + +armel-noyield.patch