From b01237f698ea3bb5b61365dd1c5e439c49d5f3bd Mon Sep 17 00:00:00 2001
From: fgsfds <derp.primus@gmail.com>
Date: Wed, 8 Feb 2023 01:01:26 +0100
Subject: [PATCH] scripts: revert the arm64->aarch64 change

---
 cmake/LibraryNaming.cmake          | 2 +-
 contrib/iZarif/premake5.lua        | 2 +-
 contrib/iZarif/xash.lua            | 2 +-
 scripts/waifulib/library_naming.py | 2 +-
 scripts/waifulib/xcompile.py       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake
index feae5b70..156ab672 100644
--- a/cmake/LibraryNaming.cmake
+++ b/cmake/LibraryNaming.cmake
@@ -79,7 +79,7 @@ elseif(XASH_X86)
 		set(BUILDARCH "i386")
 	endif()
 elseif(XASH_ARM AND XASH_64BIT)
-	set(BUILDARCH "aarch64")
+	set(BUILDARCH "arm64")
 elseif(XASH_ARM)
 	set(BUILDARCH "armv")
 	if(XASH_ARMv8)
diff --git a/contrib/iZarif/premake5.lua b/contrib/iZarif/premake5.lua
index 55e438ea..91817da5 100644
--- a/contrib/iZarif/premake5.lua
+++ b/contrib/iZarif/premake5.lua
@@ -55,7 +55,7 @@ newoption{trigger = "lto", description = "Enable Link Time Optimization", defaul
 newoption{trigger = "arch", description = "Destination arch", default = xash.get_arch(), allowed = {
   {"amd64", ""},
   {"x86", ""},
-  {"aarch64", ""},
+  {"arm64", ""},
   {"armv8_32l", ""},
   {"armv7l", ""},
   {"armv6l", ""},
diff --git a/contrib/iZarif/xash.lua b/contrib/iZarif/xash.lua
index a94febb3..0388602d 100644
--- a/contrib/iZarif/xash.lua
+++ b/contrib/iZarif/xash.lua
@@ -89,7 +89,7 @@ function m.get_arch()
       arch = "x86"
     elseif m.is_cxx_symbol_defined("XASH_ARM", {"build.h"}, {"public"}) then
       if m.is_cxx_symbol_defined("XASH_64BIT", {"build.h"}, {"public"}) then
-        arch = "aarch64"
+        arch = "arm64"
       else
         arch = "armv"
 
diff --git a/scripts/waifulib/library_naming.py b/scripts/waifulib/library_naming.py
index de508625..3709bc76 100644
--- a/scripts/waifulib/library_naming.py
+++ b/scripts/waifulib/library_naming.py
@@ -107,7 +107,7 @@ def configure(conf):
 		else:
 			buildarch = "i386"
 	elif conf.env.XASH_ARM and conf.env.XASH_64BIT:
-		buildarch = "aarch64"
+		buildarch = "arm64"
 	elif conf.env.XASH_ARM:
 		buildarch = "armv"
 		if conf.env.XASH_ARMv8:
diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py
index e407c603..51d8ec87 100644
--- a/scripts/waifulib/xcompile.py
+++ b/scripts/waifulib/xcompile.py
@@ -352,7 +352,7 @@ class Android:
 
 class NintendoSwitch:
 	ctx          = None # waf context
-	arch         = "aarch64"
+	arch         = "arm64"
 	dkp_dir      = None
 	portlibs_dir = None
 	dka64_dir    = None