diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-19 16:43:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-21 15:01:13 +0200 |
| commit | 8179d7edf6cb2b06666634d0cafddbca974931e1 (patch) | |
| tree | 7634db5b5a385cfba9f0497306b6630b123c6658 /src/corelib/tools/qhash.cpp | |
| parent | 5d0085049e0326c962ffbd50da58107b874de528 (diff) | |
Add runtime aes/crypto check for ARM
Yocto apparantly enables it hard at compile time.
Change-Id: I1d4c7402eacc714859c61f469ebed85682d48b51
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qhash.cpp')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index b036add70f..187839ca08 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -670,7 +670,9 @@ size_t qHashBits(const void *p, size_t size, size_t seed) noexcept if (seed && qCpuHasFeature(AES) && qCpuHasFeature(SSE4_2)) return aeshash(reinterpret_cast<const uchar *>(p), size, seed); #elif defined(__ARM_FEATURE_CRYPTO) - if (seed) + // Do additional runtime check as Yocto hard enables Crypto extension for + // all armv8 configs + if (seed && (qCpuFeatures() & CpuFeatureAES)) return aeshash(reinterpret_cast<const uchar *>(p), size, seed); #endif if (size <= QT_POINTER_SIZE) |