summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/tools/qsimd.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 1ef513c..11357b3 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -54,7 +54,12 @@ uint qDetectCPUFeatures()
if (features != 0xffffffff)
return features;
-#if defined (Q_OS_WINCE)
+#if defined (Q_OS_NACL)
+ // The qDetectCPUFeatures assembler fails verification in the
+ // Native Client sandbox due to use of pushf/popf.
+ features = 0;
+ return features;
+#elif defined (Q_OS_WINCE)
#if defined (ARM)
if (IsProcessorFeaturePresent(PF_ARM_INTEL_WMMX)) {
features = IWMMXT;