diff options
| author | Martin Storsjö <martin@martin.st> | 2020-11-03 16:51:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-04 08:22:02 +0000 |
| commit | aec48eef1619cd95e0286149e2dedb2dc3df1f05 (patch) | |
| tree | 7d53818c07f22502657785fb062a36a4704005d8 /src/corelib/global/qglobal.h | |
| parent | 9677d1b5b2871e41cbc670ae6530d2246b2d0477 (diff) | |
qglobal: Only define QT_ENSURE_STACK_ALIGNED_FOR_SSE for i386
This define is only supposed to be used for i386, but was set for
any 32 bit mingw architecture (which also covers armv7).
Change-Id: Iedc057dfc493015e8339db837dbe20a57c2b2367
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 317145af84c055cf019c84b9090f53bd8c61c5da)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7aa856a65d..a024e69751 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -632,7 +632,7 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed; //defines the type for the WNDPROC on windows //the alignment needs to be forced for sse2 to not crash with mingw #if defined(Q_OS_WIN) -# if defined(Q_CC_MINGW) && !defined(Q_OS_WIN64) +# if defined(Q_CC_MINGW) && defined(Q_PROCESSOR_X86_32) # define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer)) # else # define QT_ENSURE_STACK_ALIGNED_FOR_SSE |