diff options
| author | Martin Storsjö <martin@martin.st> | 2020-11-03 16:51:34 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-11-04 06:39:03 +0200 |
| commit | 317145af84c055cf019c84b9090f53bd8c61c5da (patch) | |
| tree | 164a60a25aa87d2a7dddc26498e160aede754ef4 /src/corelib/global/qglobal.h | |
| parent | 3e13fd43df6208aca3c4d5e94a8aa9f0d255ff85 (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
Pick-to: 5.15
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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 ae20e3da75..cbc1189308 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -611,7 +611,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 |