[Apple Silicon] Support building for macOS arm64/arm64e

Author: shahmishal

cmake/modules/DarwinSDKs.cmake

@@ -14,7 +14,7 @@ set(SUPPORTED_TVOS_ARCHS "arm64")
 set(SUPPORTED_TVOS_SIMULATOR_ARCHS "x86_64")
 set(SUPPORTED_WATCHOS_ARCHS "armv7k")
 set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386")
-set(SUPPORTED_OSX_ARCHS "x86_64")
+set(SUPPORTED_OSX_ARCHS "x86_64;arm64;arm64e")
 
 is_sdk_requested(OSX swift_build_osx)
 if(swift_build_osx)

utils/build-script-impl

@@ -416,6 +416,8 @@ function verify_host_is_supported() {
       | linux-powerpc64le       \
       | linux-s390x             \
       | macosx-x86_64           \
+      | macosx-arm64            \
+      | macosx-arm64e           \
       | iphonesimulator-i386    \
       | iphonesimulator-x86_64  \
       | iphoneos-armv7          \
@@ -493,6 +495,24 @@ function set_build_options_for_host() {
                     SWIFT_HOST_VARIANT_SDK="OSX"
                     cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
                     ;;
+                macosx-arm64)
+                    xcrun_sdk_name="macosx"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    SWIFT_HOST_VARIANT="macosx"
+                    SWIFT_HOST_VARIANT_SDK="OSX"
+                    SWIFT_HOST_VARIANT_ARCH="arm64"
+                    cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    ;;
+                macosx-arm64e)
+                    xcrun_sdk_name="macosx"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64e-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    SWIFT_HOST_VARIANT="macosx"
+                    SWIFT_HOST_VARIANT_SDK="OSX"
+                    SWIFT_HOST_VARIANT_ARCH="arm64e"
+                    cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    ;;
                 iphonesimulator-i386)
                     SWIFT_HOST_TRIPLE="i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
                     llvm_target_arch="X86"
@@ -920,7 +940,7 @@ function false_true() {
 CROSS_COMPILE_HOSTS=($CROSS_COMPILE_HOSTS)
 for t in "${CROSS_COMPILE_HOSTS[@]}"; do
     case ${t} in
-        iphone* | appletv* | watch* | linux-armv6 | linux-armv7 )
+        macosx-arm64* | iphone* | appletv* | watch* | linux-armv6 | linux-armv7 )
             ;;
         *)
             echo "Unknown host to cross-compile for: ${t}"
@@ -1187,6 +1207,9 @@ function common_cross_c_flags() {
     local arch=${host##*-}
 
     case $host in
+        macosx-*)
+            echo -n " -arch ${arch} "
+            ;;
         iphonesimulator-*)
             echo -n " -arch ${arch}  -mios-simulator-version-min=${DARWIN_DEPLOYMENT_VERSION_IOS}"
             ;;

utils/swift_build_support/swift_build_support/targets.py

@@ -114,7 +114,7 @@ def name(self):
 
 
 class StdlibDeploymentTarget(object):
-    OSX = DarwinPlatform("macosx", archs=["x86_64"],
+    OSX = DarwinPlatform("macosx", archs=["x86_64", "arm64", "arm64e"],
                          sdk_name="OSX")
 
     iOS = DarwinPlatform("iphoneos", archs=["armv7", "armv7s", "arm64", "arm64e"],