From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sat, 5 May 2018 01:53:17 +0000 (+0100)
Subject: x32
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-16+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0fb3299bdb95596074c2836bf011f1ff998af028;p=qt4-x11.git

x32


Gbp-Pq: Name x32.diff
---

diff --git a/configure b/configure
index 665ccfb23..5eca02ab4 100755
--- a/configure
+++ b/configure
@@ -3330,6 +3330,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
         fi
         CFG_HOST_ARCH=sh
         ;;
+    *:*:x32)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    32-bit AMD 80x86 (x32)"
+        fi
+        CFG_HOST_ARCH=x32
+        ;;
     *:*:*)
         if [ "$OPT_VERBOSE" = "yes" ]; then
             echo "    Trying '$UNAME_MACHINE'..."
diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
index c91c20b31..30277ca52 100644
--- a/src/corelib/arch/qatomic_arch.h
+++ b/src/corelib/arch/qatomic_arch.h
@@ -92,6 +92,8 @@ QT_BEGIN_HEADER
 #  include "QtCore/qatomic_sh.h"
 #elif defined(QT_ARCH_SH4A)
 #  include "QtCore/qatomic_sh4a.h"
+#elif defined(QT_ARCH_X32)
+#  include "QtCore/qatomic_i386.h"
 #elif defined(QT_ARCH_NACL)
 #  include "QtCore/qatomic_generic.h"
 #elif defined(QT_ARCH_AARCH64)
diff --git a/src/corelib/arch/x32/arch.pri b/src/corelib/arch/x32/arch.pri
new file mode 100644
index 000000000..b8832d91c
--- /dev/null
+++ b/src/corelib/arch/x32/arch.pri
@@ -0,0 +1,4 @@
+#
+# X32 architecture
+#
+# nothing special needed here