diff --git a/src/corelib/global/qsimd.cpp b/src/corelib/global/qsimd.cpp index 4630122adc7..cc904335673 100644 --- a/src/corelib/global/qsimd.cpp +++ b/src/corelib/global/qsimd.cpp @@ -564,6 +564,12 @@ uint64_t QT_MANGLE_NAMESPACE(qDetectCpuFeatures)() // Yocto hard-codes CRC32+AES on. Since they are unlikely to be used // automatically by compilers, we can just add runtime check. minFeatureTest &= ~(CpuFeatureAES|CpuFeatureCRC32); +#endif +#if defined(Q_PROCESSOR_X86_64) && defined(cpu_feature_shstk) + // Controlflow Enforcement Technology (CET) is an OS-assisted + // hardware-feature, meaning the CPUID bit may be disabled if the OS + // doesn't support it, but that's ok. + minFeatureTest &= ~CpuFeatureSHSTK; #endif QCpuFeatureType f = detectProcessorFeatures();