Merge branch 'experimental' into 'experimental'
Don't use yield on armel where the baseline does not support it See merge request qt-kde-team/qt6/qt6-base!12
This commit is contained in:
commit
60a77c24a8
14
debian/patches/armel-noyield.patch
vendored
Normal file
14
debian/patches/armel-noyield.patch
vendored
Normal file
@ -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
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -8,3 +8,5 @@ upstream_QFileSystemEngine-canonicalName-Unix-clean-up-contro.patch
|
|||||||
# Debian specific
|
# Debian specific
|
||||||
remove_privacy_breaches.diff
|
remove_privacy_breaches.diff
|
||||||
build_path_embedded_qtbuildinternalsextra_cmake.patch
|
build_path_embedded_qtbuildinternalsextra_cmake.patch
|
||||||
|
|
||||||
|
armel-noyield.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user