Index: lib/builtins/assembly.h
===================================================================
--- lib/builtins/assembly.h
+++ lib/builtins/assembly.h
@@ -49,33 +49,6 @@
 #endif
 
 #if defined(__arm__)
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||                     \
-    defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) ||                    \
-    defined(__ARM_ARCH_7EM__)
-#define __ARM_ARCH 7
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||                     \
-    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) ||                    \
-    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6ZM__)
-#define __ARM_ARCH 6
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) ||                     \
-    defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
-#define __ARM_ARCH 5
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#define __ARM_ARCH 4
-#endif
-
 #if defined(__ARM_ARCH_4T__) || __ARM_ARCH >= 5
 #define ARM_HAS_BX
 #endif