diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-14 11:18:23 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-14 11:18:23 (GMT) |
| commit | 3cd3206cdaf4b1cf0ccf50b2d0a7d67a68be582e (patch) | |
| tree | e79edb6ebf9b0cd74f39a56e437346642f23c94a /src/corelib | |
| parent | 03db204f7c2b0c33c7235080362c7838980d0d8e (diff) | |
| download | Qt-3cd3206cdaf4b1cf0ccf50b2d0a7d67a68be582e.zip Qt-3cd3206cdaf4b1cf0ccf50b2d0a7d67a68be582e.tar.gz Qt-3cd3206cdaf4b1cf0ccf50b2d0a7d67a68be582e.tar.bz2 | |
Hardcode qDetectCPUFeatures to 0 for NaCl.
The assembler fails verification, disable for now.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 7 |
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; |