diff --git a/package/debian/rules b/package/debian/rules
index 8c50cbe04..64cccac6a 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -2,7 +2,7 @@
 
 KATIE_CROSS_EXEC=""
 ifneq ($(DEB_HOST_ARCH_CPU),$(DEB_BUILD_ARCH_CPU))
-	KATIE_CROSS_EXEC="qemu-$(DEB_HOST_ARCH_CPU)-static"
+	KATIE_CROSS_EXEC="qemu-$(DEB_HOST_GNU_CPU)-static"
 endif
 
 KATIE_BUILD_DIR="$(shell pwd)/obj-$(DEB_HOST_GNU_TYPE)"
diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h
index 87eaba948..0c418ff82 100644
--- a/src/core/global/qglobal.h
+++ b/src/core/global/qglobal.h
@@ -51,7 +51,7 @@
 
      ALPHA     - ...
      ARM       - ...
-     ARMV6     - ...
+     ARM64     - ...
      AVR32     - ...
      BFIN      - ...
      I386      - ...
@@ -75,9 +75,8 @@
 #  define QT_ARCH_ALPHA
 #elif defined(__arm__)
 #  define QT_ARCH_ARM
-#  if defined(__ARM_ARCH_6__)
-#    define QT_ARCH_ARMV6
-#  endif
+#elif defined(__aarch64__)
+#  define QT_ARCH_ARM64
 #elif defined(__avr__)
 #  define QT_ARCH_AVR32
 #elif defined(__bfin__)
@@ -100,9 +99,6 @@
 #  define QT_ARCH_SPARC
 #elif defined(__sh__)
 #  define QT_ARCH_SH
-#  if defined(__SH4__)
-#    define QT_ARCH_SH4A
-#  endif
 #elif defined(__x86_64__)
 #  define QT_ARCH_X86_64
 #else
@@ -390,8 +386,11 @@ QT_END_INCLUDE_NAMESPACE
 #endif
 
 // This logic must match the one in qmetatype.h
-#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)
+#if !defined(QT_NO_FPU) && defined(QT_ARCH_ARM) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH)
 #  define QT_NO_FPU
+#endif
+
+#if defined(QT_NO_FPU)
 typedef float qreal;
 #else
 typedef double qreal;
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index 535827c16..654136889 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -64,7 +64,7 @@ private slots:
 static const int iterations = 10;
 
 // Note: some tests rely on ThreadCount being multiple of 2
-#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) )
+#if defined(Q_OS_SOLARIS) || (defined(Q_OS_LINUX) && defined(QT_ARCH_ARM))
 static const int ThreadCount = 4;
 #else
 static const int ThreadCount = 10;