Changeset 25a1cb0 for tools/build/cfa.m4

Timestamp:

Sep 1, 2020, 1:18:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

86c1f1c3, a77496cb

Parents:

8d8ac3b (diff), d3aa64f1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tools/build/cfa.m4 (modified) (2 diffs)

tools/build/cfa.m4

@@ -66 +66 @@
                 "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 +74 @@
                 "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;