From 68f7ba21506cb1aff112ffa779b94400d14b5a59 Mon Sep 17 00:00:00 2001
From: Ivan Solovev <ivan.solovev@qt.io>
Date: Wed, 23 Mar 2022 15:01:51 +0100
Subject: [PATCH] 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>
---
 tests/auto/corelib/thread/qatomicint/BLACKLIST          | 3 ---
 tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 tests/auto/corelib/thread/qatomicint/BLACKLIST

diff --git a/tests/auto/corelib/thread/qatomicint/BLACKLIST b/tests/auto/corelib/thread/qatomicint/BLACKLIST
deleted file mode 100644
index 406fb7cc1c..0000000000
--- a/tests/auto/corelib/thread/qatomicint/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-# QTBUG-87422
-[alignment]
-android
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
 }