1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows arm64: Use correct Q_PROCESSOR_ARM_64 define check

Browse Source 
Inclusion of qt_windows.h is needed to avoid  "No Target Architecture"
in winnt.h.

Change-Id: Ic67ce8a306ef52c4ce3e6eaad0b7864632610737
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Oliver Wolff 2022-01-04 06:18:44 +01:00
parent dac76bb442
commit 32caaacee3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qsimd.cpp
View File

@ -54,7 +54,8 @@
# if !defined(Q_CC_GNU) # if !defined(Q_CC_GNU)
# include <intrin.h> # include <intrin.h>
# endif # endif
# if defined(Q_PROCESSOR_ARM64) # if defined(Q_PROCESSOR_ARM_64)
# include <qt_windows.h>
# include <processthreadsapi.h> # include <processthreadsapi.h>
# endif # endif
#elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_MIPS_32) #elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_MIPS_32)
@ -166,7 +167,7 @@ static inline quint64 detectProcessorFeatures()
features |= CpuFeatureAES; features |= CpuFeatureAES;
#endif #endif
return features; return features;
#elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM64) #elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM_64)
features |= CpuFeatureNEON; features |= CpuFeatureNEON;
if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != 0) if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != 0)
features |= CpuFeatureCRC32; features |= CpuFeatureCRC32;