diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-03-23 15:01:51 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-03-25 21:55:51 +0100 |
| commit | 68f7ba21506cb1aff112ffa779b94400d14b5a59 (patch) | |
| tree | cf91d92e4dcfea877c68b4fa7ecc9a71c44f96c5 /tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | |
| parent | a8a7f6c4e63d5f03675937431b736962aa8941df (diff) | |
tst_QAtomicInt: do not check qlonglong alignment for x86_32 CPUs
For x86_32 the alignment of QBasicAtomicInteger<8 bytes> is not
equal to the alignment of TypeInStruct<8 bytes>, so do not perform
the check.
Fixes: QTBUG-87422
Pick-to: 6.3 6.2
Change-Id: I6e6c6cb7b2b7195e430d6a6991004bcfce16d4cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp')
| -rw-r--r-- | tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index 1f0d9e7779..5fbdc8a4d3 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -242,7 +242,8 @@ void tst_QAtomicInt::alignment() QCOMPARE(alignof(QBasicAtomicInteger<char>), alignof(TypeInStruct<char>)); #endif -#ifdef Q_ATOMIC_INT64_IS_SUPPORTED +#if !defined(Q_PROCESSOR_X86_32) && defined(Q_ATOMIC_INT64_IS_SUPPORTED) + // The alignment is different on x86_32 QCOMPARE(alignof(QBasicAtomicInteger<qlonglong>), alignof(TypeInStruct<qlonglong>)); #endif } |