more fixes

Author: martin4861

cc/repositories.bzl

@@ -111,7 +111,7 @@ def swift_cc_toolchain_llvm20():
         build_file = Label("@rules_swiftnav//cc/toolchains/llvm20:llvm.BUILD.bzl"),
         url = X86_64_DARWIN_LLVM20,
         strip_prefix = "LLVM-20.1.7-macOS-X64",
-        # TODO: Add sha256 hash for integrity
+        sha256 = "8494c98a774051a40bfe1187a2d6442f4bc107598998bbe1673d9bb1572cfd6f"
     )
 
     maybe(
@@ -120,7 +120,7 @@ def swift_cc_toolchain_llvm20():
         build_file = Label("@rules_swiftnav//cc/toolchains/llvm20:llvm.BUILD.bzl"),
         url = AARCH64_LINUX_LLVM20,
         strip_prefix = "LLVM-20.1.7-Linux-ARM64",
-        # TODO: Add sha256 hash for integrity
+        sha256 = "832f2802a29457dc758f56e26e98558c6cd0e45fcd07186f540cb6e7f4e59385",
     )
 
     maybe(
@@ -129,7 +129,7 @@ def swift_cc_toolchain_llvm20():
         build_file = Label("@rules_swiftnav//cc/toolchains/llvm20:llvm.BUILD.bzl"),
         url = X86_64_LINUX_LLVM20,
         strip_prefix = "LLVM-20.1.7-Linux-X64",
-        # TODO: Add sha256 hash for integrity
+        sha256 = "8494c98a774051a40bfe1187a2d6442f4bc107598998bbe1673d9bb1572cfd6f",
     )
 
 def aarch64_sysroot():

cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel

@@ -106,13 +106,8 @@ cc_toolchain_config(
     cxx_builtin_include_directories = [
         "%sysroot%/usr/include",
     ],
-    extra_copts = select({
-        "@rules_swiftnav//cc/constraints:graviton2": ["-mcpu=neoverse-n1"],
-        "@rules_swiftnav//cc/constraints:graviton3": ["-mcpu=neoverse-512tvb"],
-        "//conditions:default": [],
-    }),
     host_system_name = X86_64_LINUX,
-    target_cpu = "k8",
+    target_cpu = "aarch64",
     target_libc = "glibc_unknown",
     target_system_name = AARCH64_LINUX,
     tool_paths = {
@@ -146,34 +141,14 @@ cc_toolchain(
 )
 
 toolchain(
-    name = "cc-toolchain-aarch64-bullseye-graviton2",
+    name = "cc-toolchain-aarch64-linux",
     exec_compatible_with = [
         "@platforms//cpu:x86_64",
         "@platforms//os:linux",
     ],
     target_compatible_with = [
         "@platforms//os:linux",
         "@platforms//cpu:aarch64",
-        "@rules_swiftnav//cc/constraints:glibc_2_31",
-        "@rules_swiftnav//cc/constraints:graviton2",
-        "@rules_swiftnav//cc/constraints:llvm20_toolchain",
-    ],
-    target_settings = None,
-    toolchain = ":cc-clang-x86_64-aarch64-linux",
-    toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
-)
-
-toolchain(
-    name = "cc-toolchain-aarch64-bullseye-graviton3",
-    exec_compatible_with = [
-        "@platforms//cpu:x86_64",
-        "@platforms//os:linux",
-    ],
-    target_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:aarch64",
-        "@rules_swiftnav//cc/constraints:glibc_2_31",
-        "@rules_swiftnav//cc/constraints:graviton3",
         "@rules_swiftnav//cc/constraints:llvm20_toolchain",
     ],
     target_settings = None,