Index: tools/build/cfa.m4
===================================================================
--- tools/build/cfa.m4	(revision 6bd2cfb14fd5626001c1d2b3b915b6ea8cc6da54)
+++ tools/build/cfa.m4	(revision 98cf828382529e834a19d4b7937f761b5573e382)
@@ -66,5 +66,7 @@
 		"x86-64"     ) cannon_arch_name="x64";;
 		"x86_64"     ) cannon_arch_name="x64";;
-		"aarch64"    ) cannon_arch_name="arm";;
+		"aarch64"    ) cannon_arch_name="arm64";;
+		"arm4"       ) cannon_arch_name="arm64";;
+		"ARM64"      ) cannon_arch_name="arm64";;
 		"x86"        ) cannon_arch_name="x86";;
 		"i386"       ) cannon_arch_name="x86";;
@@ -72,7 +74,9 @@
 		"i686"       ) cannon_arch_name="x86";;
 		"Intel 80386") cannon_arch_name="x86";;
-		"arm"        ) cannon_arch_name="arm";;
-		"ARM"        ) cannon_arch_name="arm";;
-		"armv7l"     ) cannon_arch_name="arm";;
+		"arm"        ) cannon_arch_name="arm32";;
+		"ARM"        ) cannon_arch_name="arm32";;
+		"arm32"      ) cannon_arch_name="arm32";;
+		"ARM32"      ) cannon_arch_name="arm32";;
+		"armv7l"     ) cannon_arch_name="arm32";;
 		*)
 		>&2 echo "Unknown architecture " $arch_name;