diff --git a/makefile b/makefile
index 4ec2186cac3..ab3cd164ddc 100644
--- a/makefile
+++ b/makefile
@@ -284,11 +284,14 @@ ARCHITECTURE := _x64
 endif
 ifeq ($(PROCESSOR_ARCHITECTURE),x86)
 ARCHITECTURE := _x64
+ifeq ($(PROCESSOR_ARCHITECTURE),ARM6)
+ARCHITECTURE := _arm64
 ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
 else
 ARCHITECTURE := _x86
 endif
 endif
+endif
 else
 UNAME    := $(shell uname -mps)
 TARGETOS := $(OS)
@@ -304,9 +307,13 @@ else
 ifeq ($(ARCHITECTURE),_x64)
 MPARAM := -m64
 else
+ifeq ($(ARCHITECTURE),_arm64)
+MPARAM :=
+else
 MPARAM :=
 endif
 endif
+endif
 
 ARCHITECTURE := _x86
 
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5310e003ed8..fca710ca67a 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -464,6 +464,7 @@ configurations {
 if _ACTION == "xcode4" then
 	platforms {
 		"x64",
+		"ARM64"
 	}
 else
 	platforms {
@@ -685,12 +686,12 @@ else
 			linkoptions {
 				"-arch x86_64",
 			}
-		configuration { "x32" }
+		configuration { "ARM64"}
 			buildoptions {
-				"-arch i386",
+				"-arch ARM64",
 			}
 			linkoptions {
-				"-arch i386",
+				"-arch ARM64",
 			}
 		configuration { }
 	end
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 3eb2acf0e0b..dedc09da94c 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -1076,6 +1076,18 @@ function toolchain(_buildDir, _subDir)
 
 	configuration { "osx*", "x64", "Debug" }
 		targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
+		
+	configuration { "osx*", "ARM64" }
+		objdir (_buildDir .. "osx_clang" .. "/obj")
+		buildoptions {
+			"-m64", "-DHAVE_IMMINTRIN_H=1",
+		}
+
+	configuration { "osx*", "ARM64", "Release" }
+		targetdir (_buildDir .. "osx_clang" .. "/bin/ARM64/Release")
+
+	configuration { "osx*", "ARM64", "Debug" }
+		targetdir (_buildDir .. "osx_clang" .. "/bin/ARM64/Debug")
 
 	configuration { "ios-arm" }
 		targetdir (_buildDir .. "ios-arm" .. "/bin")