Make arm64e compiler-rt for iOS

Author: dtapuska

llvm/utils/gn/build/BUILD.gn

@@ -356,7 +356,7 @@ config("compiler_defaults") {
   }
   if ((current_os == "ios" || current_os == "mac") &&
       (clang_base_path != "" || sysroot != "")) {
-    if (current_os == "ios" && current_cpu == "arm64") {
+    if (current_os == "ios" && (current_cpu == "arm64" || current_cpu == "arm64e")) {
       sdk_path = ios_sdk_path
     } else if (current_os == "ios" && current_cpu == "x64") {
       sdk_path = iossim_sdk_path

llvm/utils/gn/build/toolchain/BUILD.gn

@@ -244,6 +244,13 @@ if (host_os == "mac") {
     }
   }
 
+  stage2_unix_toolchain("stage2_ios_arm64e") {
+    toolchain_args = {
+      current_os = "ios"
+      current_cpu = "arm64e"
+    }
+  }
+
   stage2_unix_toolchain("stage2_iossim_x64") {
     toolchain_args = {
       current_os = "ios"

llvm/utils/gn/build/toolchain/target_flags.gni

@@ -32,6 +32,15 @@ if (current_os == "android") {
       "-arch",
       "arm64",
     ]
+  } else if (current_cpu == "arm64e") {
+    target_flags += [
+      "-arch",
+      "arm64e",
+    ]
+    target_ldflags += [
+      "-arch",
+      "arm64e",
+    ]
   } else if (current_cpu == "x64") {
     target_flags += [
       "-arch",

llvm/utils/gn/secondary/compiler-rt/BUILD.gn

@@ -28,7 +28,7 @@ group("compiler-rt") {
   # That would match the cmake build.
   if (host_os == "mac" && have_ios_sdks) {
     if (llvm_build_AArch64) {
-      deps += [ "//compiler-rt/lib/builtins(//llvm/utils/gn/build/toolchain:stage2_ios_aarch64)" ]
+      deps += [ "//compiler-rt/lib/builtins(//llvm/utils/gn/build/toolchain:stage2_ios_arm64e)" ]
     }
     if (llvm_build_X86) {
       deps += [ "//compiler-rt/lib/builtins(//llvm/utils/gn/build/toolchain:stage2_iossim_x64)" ]

llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn

@@ -54,7 +54,7 @@ static_library("builtins") {
   output_dir = crt_current_out_dir
   if (current_os == "mac") {
     output_name = "clang_rt.osx"
-  } else if (current_os == "ios" && current_cpu == "arm64") {
+  } else if (current_os == "ios" && current_cpu == "arm64e") {
     output_name = "clang_rt.ios"
   } else if (current_os == "ios" && current_cpu == "x64") {
     output_name = "clang_rt.iossim"

llvm/utils/gn/secondary/compiler-rt/target.gni

@@ -13,6 +13,8 @@ if (current_cpu == "x86") {
   crt_current_target_arch = "arm"
 } else if (current_cpu == "arm64") {
   crt_current_target_arch = "aarch64"
+} else if (current_cpu == "arm64e") {
+  crt_current_target_arch = "arm64e"
 } else if (current_cpu == "ppc64") {
   crt_current_target_arch = "powerpc64le"
 } else {

llvm/utils/gn/secondary/llvm/triples.gni

@@ -36,6 +36,10 @@ if (current_cpu == "x86") {
   if (current_os == "linux") {
     llvm_current_triple = "powerpc64le-unknown-linux-gnu"
   }
+} else if (current_cpu == "arm64e") {
+  if (current_os == "ios" || current_os == "mac") {
+    llvm_current_triple = "arm64e-apple-darwin"
+  }
 }
 
 if (!defined(llvm_current_triple)) {