Add a few missing Neon constructs

The #undef in qcompilerdetection.h was missing.

And apparently we can detect Neon since Windows Mobile 6 too.

Change-Id: I38a5f71b2704a29a706183e39f43db3a78a729db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Thiago Macieira 2014-06-24 17:51:28 -07:00
parent cd33318025
commit 986230eef9
2 changed files with 7 additions and 7 deletions

View File

@ -1070,6 +1070,7 @@
#endif #endif
#if !defined(Q_PROCESSOR_ARM) #if !defined(Q_PROCESSOR_ARM)
# undef QT_COMPILER_SUPPORTS_IWMMXT # undef QT_COMPILER_SUPPORTS_IWMMXT
# undef QT_COMPILER_SUPPORTS_NEON
#endif #endif
#if !defined(Q_PROCESSOR_MIPS) #if !defined(Q_PROCESSOR_MIPS)
# undef QT_COMPILER_SUPPORTS_MIPS_DSP # undef QT_COMPILER_SUPPORTS_MIPS_DSP

View File

@ -86,19 +86,18 @@ static inline uint detectProcessorFeatures()
uint features = 0; uint features = 0;
#if defined (ARM) #if defined (ARM)
if (IsProcessorFeaturePresent(PF_ARM_INTEL_WMMX)) { if (IsProcessorFeaturePresent(PF_ARM_INTEL_WMMX))
features = IWMMXT; features |= IWMMXT;
return features; # ifdef PF_ARM_NEON
} if (IsProcessorFeaturePresent(PF_ARM_NEON))
features |= ARM_NEON;
# endif
#elif defined(_X86_) #elif defined(_X86_)
features = 0;
if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE))
features |= SSE2; features |= SSE2;
if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE))
features |= SSE3; features |= SSE3;
return features;
#endif #endif
features = 0;
return features; return features;
} }