diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-08-03 17:23:20 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-05 04:12:10 +0000 |
| commit | b71cd7e93dc182a87777a76776ed159a01ec8e36 (patch) | |
| tree | 658c3dba45abe55684d832d4a33e5b9f81d29798 | |
| parent | 5177d401d1aaf414323dfd0958a7b0a9abeb273e (diff) | |
Fix qYieldCpu() for ARM < ARMv7
Apparently, we still support these architecture versions, and there's
no way to detect ARMv6k-or-greater specifically, so exclude yield for
ARM < ARMv7.
Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
Fixes: QTBUG-104316
Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 8128abeaece5b05476f79ff493597b838b223512)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/global/qsimd_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h index d270d09f2f..8b3da89ec5 100644 --- a/src/corelib/global/qsimd_p.h +++ b/src/corelib/global/qsimd_p.h @@ -417,7 +417,7 @@ static inline void qYieldCpu() { #if defined(Q_PROCESSOR_X86) _mm_pause(); -#elif defined(Q_PROCESSOR_ARM) +#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */ # if __has_builtin(__builtin_arm_yield) /* e.g. Clang */ __builtin_arm_yield(); # elif defined(Q_OS_INTEGRITY) || \ |