Beginning to address PR issues.

Author: hpux735

CoreFoundation/Base.subproj/CFBase.c

@@ -875,17 +875,7 @@ void _CFRuntimeSetCFMPresent(void *addr) {
 
 
 extern void __HALT() {
-#if defined(__ppc__) || defined(__arm__)
-    __asm__("trap");
-
-#elif defined(__i386__) || defined(__x86_64__)
-#if defined(_MSC_VER)
-    __asm int 3;
-#else
-    __asm__("int3");
-#endif
-
-#endif
+  __builtin_trap();
 }
 
 

lib/target.py

@@ -138,14 +138,12 @@ def to_string(value):
 # Not 1:1, See to_string
     @staticmethod
     def from_string(string):
-        if string == "arm":
-            return ArchType.arm
-        if string == "armv7":
-            return ArchType.arm
-        if string == "armv7l":
-            return ArchType.arm
+        # Match big endian arm first
         if string == "armeb":
             return ArchType.armeb
+        # Catch-all for little endian arm
+        if "arm" in string:
+            return ArchType.arm
         if string == "aarch64":
             return ArchType.aarch64
         if string == "aarch64_be":