x32

Gbp-Pq: Name x32.diff

diff --git a/configure b/configure
index 665ccfb23762e981b9f9a6f7656365d0c7a2c7cf..5eca02ab4adc1c030ee62944245cb523d9d33992 100755 (executable)
--- 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 c91c20b3133c7e23e73c311cbb5fe960a301a5fd..30277ca52fc9fceec7e14e07352a0eb8943507c0 100644 (file)
--- 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 (file)
index 0000000..b8832d9
--- /dev/null
+++ b/src/corelib/arch/x32/arch.pri
@@ -0,0 +1,4 @@
+#
+# X32 architecture
+#
+# nothing special needed here