Ticket #3345: 0ad-arm64-v2.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/aarch64/aarch64.cpp

@@ +1 @@
+/* Copyright (c) 2012 Wildfire Games
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * routines specific to ARM64
+ */
+
+#include "precompiled.h"
+
+#include "lib/sysdep/cpu.h"
+
+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
+{
+    return __sync_fetch_and_add(location, increment);
+}
+
+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
+{
+    return __sync_bool_compare_and_swap(location, expected, newValue);
+}
+
+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
+{
+    return __sync_bool_compare_and_swap(location, expected, newValue);
+}
+
+const char* cpu_IdentifierString()
+{
+    return "unknown"; // TODO
+}

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);