diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json
new file mode 100644
index 000000000000..607c3327cc78
--- /dev/null
+++ b/.github/config/evergreen-arm64.json
@@ -0,0 +1,42 @@
+{
+  "docker_service": "build-evergreen",
+  "platforms": [
+    "evergreen-arm64",
+    "evergreen-arm64-sbversion-15",
+    "evergreen-arm64-sbversion-14",
+    "evergreen-arm64-sbversion-13"
+  ],
+  "includes": [
+    {
+      "name":"arm64",
+      "platform":"evergreen-arm64",
+      "target_platform":"evergreen-arm64",
+      "target_cpu":"target_cpu=\\\"arm64\\\"",
+      "extra_gn_arguments":"use_asan=false"
+    },
+    {
+      "name":"sbversion-15",
+      "platform":"evergreen-arm64-sbversion-15",
+      "target_platform":"evergreen-arm64",
+      "target_cpu":"target_cpu=\\\"arm64\\\"",
+      "extra_gn_arguments":"use_asan=false",
+      "sb_api_version":"sb_api_version=15"
+    },
+    {
+      "name":"sbversion-14",
+      "platform":"evergreen-arm64-sbversion-14",
+      "target_platform":"evergreen-arm64",
+      "target_cpu":"target_cpu=\\\"arm64\\\"",
+      "extra_gn_arguments":"use_asan=false",
+      "sb_api_version":"sb_api_version=14"
+    },
+    {
+      "name":"sbversion-13",
+      "platform":"evergreen-arm64-sbversion-13",
+      "target_platform":"evergreen-arm64",
+      "target_cpu":"target_cpu=\\\"arm64\\\"",
+      "extra_gn_arguments":"use_asan=false",
+      "sb_api_version":"sb_api_version=13"
+    }
+  ]
+}
diff --git a/.github/workflows/evergreen.yaml b/.github/workflows/evergreen.yaml
index f3c3018a49b7..ef12fdf0bba1 100644
--- a/.github/workflows/evergreen.yaml
+++ b/.github/workflows/evergreen.yaml
@@ -49,6 +49,15 @@ jobs:
       platform: evergreen-arm-softfp
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
+  evergreen-arm64:
+    uses: ./.github/workflows/main.yaml
+    permissions:
+      packages: write
+      pull-requests: write
+    with:
+      platform: evergreen-arm64
+      nightly: ${{ github.event.inputs.nightly }}
+      run_api_leak_detector: true
   evergreen-x86:
     uses: ./.github/workflows/main.yaml
     permissions:
diff --git a/third_party/llvm-project/compiler-rt/BUILD.gn b/third_party/llvm-project/compiler-rt/BUILD.gn
index def4d9fb5d8f..ba235fc1c76c 100644
--- a/third_party/llvm-project/compiler-rt/BUILD.gn
+++ b/third_party/llvm-project/compiler-rt/BUILD.gn
@@ -74,9 +74,10 @@ static_library("compiler_rt") {
       "lib/builtins/extendsftf2.c",
       "lib/builtins/fixtfsi.c",
       "lib/builtins/floatsitf.c",
+      "lib/builtins/floatunditf.c",
       "lib/builtins/floatunsitf.c",
-      "lib/builtins/riscv/fp_mode.c",
       "lib/builtins/multf3.c",
+      "lib/builtins/riscv/fp_mode.c",
       "lib/builtins/subtf3.c",
       "lib/builtins/trunctfdf2.c",
       "lib/builtins/trunctfsf2.c",