Ticket #3345: 0ad-arm64.patch

build/premake/premake4.lua

@@ -86 +86 @@
             arch = "x86"
         elseif string.find(machine, "arm") == 1 then
             arch = "arm"
+        elseif string.find(machine, "aarch64") == 1 then
+            arch = "aarch64"
         else
             print("WARNING: Cannot determine architecture from GCC, assuming x86")
         end
@@ -828 +830 @@
         table.insert(source_dirs, "lib/sysdep/arch/x86_x64");
     elseif arch == "arm" then
         table.insert(source_dirs, "lib/sysdep/arch/arm");
+    elseif arch == "aarch64" then
+        table.insert(source_dirs, "lib/sysdep/arch/aarch64");
     end
 
     -- OS-specific

source/lib/byte_order.h

@@ -33 +33 @@
 #ifndef BYTE_ORDER
 # define LITTLE_ENDIAN 0x4321
 # define BIG_ENDIAN    0x1234
-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_MIPS || defined(__LITTLE_ENDIAN__)
+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || defined(__LITTLE_ENDIAN__)
 #  define BYTE_ORDER LITTLE_ENDIAN
 # else
 #  define BYTE_ORDER BIG_ENDIAN

source/lib/sysdep/arch.h

@@ -58 +58 @@
 #else
 # define ARCH_ARM 0
 #endif
+// .. AArch64 (ARM64)
+#if defined(__aarch64__)
+# define ARCH_AARCH64 1
+#else
+# define ARCH_AARCH64 0
+#endif
 // .. MIPS
 #if defined(__MIPS__) || defined(__mips__) || defined(__mips)
 # define ARCH_MIPS 1
@@ -66 +72 @@
 #endif
 
 // ensure exactly one architecture has been detected
-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_MIPS) != 1
+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS) != 1
 # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
 #endif
 

source/ps/GameSetup/HWDetect.cpp

@@ -223 +223 @@
     scriptInterface.SetProperty(settings, "arch_ia32", ARCH_IA32);
     scriptInterface.SetProperty(settings, "arch_amd64", ARCH_AMD64);
     scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+    scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
 
 #ifdef NDEBUG
     scriptInterface.SetProperty(settings, "build_debug", 0);