Changeset 9509a412

Timestamp:

Aug 24, 2020, 8:31:26 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:

0254454

Parents:

61b1447

Message:

Build now supports arm32 and arm64 as seperate machines

Files:

• libcfa/src/concurrency/CtxSwitch-arm64.S (moved) (moved from libcfa/src/concurrency/CtxSwitch-arm.S)
• tests/pybin/settings.py (modified) (1 diff)
• tools/build/cfa.m4 (modified) (2 diffs)

tests/pybin/settings.py ¶

@@ -27 +27 @@
                 'x86_64'      : 'x64',
                 'x86'         : 'x86',
-                'aarch64'     : 'arm',
+                'aarch64'     : 'arm64',
+                'arm64'       : 'arm64',
+                'ARM64'       : 'arm64',
                 'i386'        : 'x86',
                 'i486'        : 'x86',
                 'i686'        : 'x86',
                 'Intel 80386' : 'x86',
-                'arm'         : 'arm',
-                'ARM'         : 'arm',
+                'arm'         : 'arm32',
+                'ARM'         : 'arm32',
+                'arm32'       : 'arm32',
+                'ARM32'       : 'arm32',
         }
 
         CrossCompileFlags = {
-                'x64' : 'ARCH_FLAGS=-m64',
-                'x86' : 'ARCH_FLAGS=-m32',
+                'x64'  : 'ARCH_FLAGS=-m64',
+                'x86'  : 'ARCH_FLAGS=-m32',
+                'arm64': 'ARCH_FLAGS=',
+                'arm32': 'ARCH_FLAGS=',
         }
 

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;