diff --git a/cmake/arch.cpp b/cmake/arch.cpp
index 51afd1566..887fb9f4b 100644
--- a/cmake/arch.cpp
+++ b/cmake/arch.cpp
@@ -1,42 +1,26 @@
 #include <stdio.h>
 
 int main() {
-#if defined(__alpha__)
-    printf("ALPHA");
+#if defined(__aarch64__)
+    printf("ARM64");
 #elif defined(__arm__)
     printf("ARM");
-#elif defined(__aarch64__)
-    printf("ARM64");
-#elif defined(__avr__)
-    printf("AVR32");
-#elif defined(__bfin__)
-    printf("BFIN");
-#elif defined(__i386__)
-    printf("I386");
-#elif defined(__ia64__)
-    printf("IA64");
-#elif defined(__m68k__)
-    printf("M68K");
-#elif defined(__mips__)
-    printf("MIPS");
-#elif defined(__hppa__)
-    printf("PARISC");
-#elif defined(__powerpc__)
-    printf("POWERPC");
-#elif defined(__powerpc64__)
-    printf("POWERPC64");
-#elif defined(__s390__)
-    printf("S390");
-#elif defined(__sparc__)
-    printf("SPARC");
-#elif defined(__sh__)
-    printf("SH");
-#elif defined(__sh4a__)
-    printf("SH4A");
 #elif defined(__x86_64__)
     printf("X86_64");
+#elif defined(__i386__)
+    printf("I386");
+#elif defined(__mips64__)
+    printf("MIPS64");
+#elif defined(__mips__)
+    printf("MIPS");
+#elif defined(__powerpc64__)
+    printf("POWERPC64");
+#elif defined(__powerpc__)
+    printf("POWERPC");
+#elif defined(__s390__)
+    printf("S390");
 #else
-    printf("Unable to detect architecture, please update above list\n");
+    printf("The architecture is not supported\n");
     return 1;
 #endif
     return 0;
diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h
index ac57405cd..d149df7a7 100644
--- a/src/core/global/qglobal.h
+++ b/src/core/global/qglobal.h
@@ -189,8 +189,7 @@ typedef std::ptrdiff_t qptrdiff;
 #  define QT_FASTCALL __attribute__((hot))
 #endif
 
-// This logic must match the one in qmetatype.h
-#if !defined(QT_NO_FPU) && defined(QT_ARCH_ARM) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH)
+#if !defined(QT_NO_FPU) && defined(QT_ARCH_ARM)
 #  define QT_NO_FPU
 #endif
 
diff --git a/src/core/kernel/qmetatype.h b/src/core/kernel/qmetatype.h
index f8cd0cafc..88fc14e7e 100644
--- a/src/core/kernel/qmetatype.h
+++ b/src/core/kernel/qmetatype.h
@@ -64,7 +64,6 @@ public:
         QVariant = 137,
         LastCoreExtType = QVariant,
 
-// This logic must match the one in qglobal.h
 #if defined(QT_NO_FPU)
         QReal = Float,
 #else