diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-05-01 08:53:47 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-05-01 18:55:42 +0000 |
| commit | 19fa58447ec95958a839f6e314fb307c181c9003 (patch) | |
| tree | 143833e34c87ffd7b25682ede5ae58222dfc97ec /src | |
| parent | 26a7c530090e98d7f30d300e06dc87bca02c8a30 (diff) | |
Revert "Include qsimd.cpp in bootstrap build"
This reverts commit 9268cb808510beb3f9c50fba273e67e5b560c3e6. That was
done in the mistaken assumption that the bootstrap library needs the
fast hashing algorithms. It doesn't, since it's only used for tools that
need deterministic output anyway.
This fixes the build on x86 where the compiler is enabling rdrand by
default (Ivy Bridge systems, but also -march=haswell and the GCC 11
-march=x86-64-v3):
qsimd.cpp:750:37: error: redefinition of ‘qsizetype qRandomCpu(void*, qsizetype)’
750 | QT_FUNCTION_TARGET(RDRND) qsizetype qRandomCpu(void *buffer, qsizetype count) noexcept
| ^~~~~~~~~~
In file included from qsimd.cpp:44:
qsimd_p.h:354:25: note: ‘qsizetype qRandomCpu(void*, qsizetype)’ previously defined here
354 | static inline qsizetype qRandomCpu(void *, qsizetype) noexcept
| ^~~~~~~~~~
Change-Id: I755911ae7d0341f49039fffd167afc7540bf0dd6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 391ab00e39..7d1a067126 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_extend_target(Bootstrap ../../corelib/global/qnumeric.cpp ../../corelib/global/qoperatingsystemversion.cpp ../../corelib/global/qrandom.cpp - ../../corelib/global/qsimd.cpp ../../corelib/io/qabstractfileengine.cpp ../../corelib/io/qbuffer.cpp ../../corelib/io/qdebug.cpp |