Support mips64 and riscv64

Upstream some patches from the Bazel Debian package to make Bazel build
on mips64 and riscv64

https://salsa.debian.org/bazel-team/bazel-bootstrap/-/tree/olek-mips-riscv-3/debian/patches

Fixes #12683

src/conditions/BUILD

@@ -66,6 +66,24 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_mips64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:mips64",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "linux_riscv64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:riscv64",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "linux_x86_64",
     constraint_values = [

src/conditions/BUILD.tools

@@ -16,6 +16,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux",
+    constraint_values = ["@platforms//os:linux"],
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "linux_ppc",
     constraint_values = [
@@ -43,6 +49,24 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_mips64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:mips64",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "linux_riscv64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:riscv64",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "linux_x86_64",
     constraint_values = [

src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java

@@ -68,6 +68,10 @@ public String convert(String input) throws OptionsParsingException {
               return "aarch64";
             case S390X:
               return "s390x";
+            case MIPS64:
+              return "mips64";
+            case RISCV64:
+              return "riscv64";
             default:
               return "unknown";
           }
@@ -107,6 +111,10 @@ public static Pair<CPU, OS> reverse(String input) {
       return Pair.of(CPU.ARM, OS.LINUX);
     } else if (input.equals("s390x")) {
       return Pair.of(CPU.S390X, OS.LINUX);
+    } else if (input.equals("mips64")) {
+      return Pair.of(CPU.MIPS64, OS.LINUX);
+    } else if (input.equals("riscv64")) {
+      return Pair.of(CPU.RISCV64, OS.LINUX);
     }
 
     // Use the auto-detected values.

src/main/java/com/google/devtools/build/lib/bazel/repository/LocalConfigPlatformFunction.java

@@ -116,6 +116,10 @@ static String cpuToConstraint(CPU cpu) {
         return "@platforms//cpu:aarch64";
       case S390X:
         return "@platforms//cpu:s390x";
+      case MIPS64:
+        return "@platforms//cpu:mips64";
+      case RISCV64:
+        return "@platforms//cpu:riscv64";
       default:
         // Unknown, so skip it.
         return null;

src/main/java/com/google/devtools/build/lib/util/CPU.java

@@ -27,6 +27,8 @@ public enum CPU {
   ARM("arm", ImmutableSet.of("arm", "armv7l")),
   AARCH64("aarch64", ImmutableSet.of("aarch64")),
   S390X("s390x", ImmutableSet.of("s390x", "s390")),
+  MIPS64("mips64", ImmutableSet.of("mips64el", "mips64")),
+  RISCV64("riscv64", ImmutableSet.of("riscv64")),
   UNKNOWN("unknown", ImmutableSet.<String>of());
 
   private final String canonicalName;

third_party/BUILD

@@ -567,6 +567,8 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({
     "//src/conditions:linux_aarch64": "*.so *.jnilib *.dll",
     "//src/conditions:linux_ppc": "*.so *.jnilib *.dll",
     "//src/conditions:linux_s390x": "*.so *.jnilib *.dll",
+    "//src/conditions:linux_mips64": "*.so *.jnilib *.dll",
+    "//src/conditions:linux_riscv64": "*.so *.jnilib *.dll",
     "//src/conditions:freebsd": "*.so *.jnilib *.dll",
     "//src/conditions:openbsd": "*.so *.jnilib *.dll",
     # Default is to play it safe -- better have a big binary than a slow binary

tools/cpp/BUILD.tools

@@ -107,13 +107,17 @@ cc_toolchain_suite(
         "x64_windows_msvc|compiler": ":cc-compiler-x64_windows_msvc",
         "s390x|compiler": ":cc-compiler-s390x",
         "ppc|compiler": ":cc-compiler-ppc",
+        "mips64|compiler": ":cc-compiler-mips64",
+        "riscv64|compiler": ":cc-compiler-riscv64",
         "k8": ":cc-compiler-local",
         "piii": ":cc-compiler-local",
         "arm": ":cc-compiler-local",
         "aarch64": ":cc-compiler-local",
         "s390x": ":cc-compiler-local",
         "ppc": ":cc-compiler-local",
         "ppc64": ":cc-compiler-local",
+        "mips64": ":cc-compiler-local",
+        "riscv64": ":cc-compiler-local",
         "darwin": ":cc-compiler-darwin",
         "freebsd": ":cc-compiler-freebsd",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
@@ -211,6 +215,60 @@ toolchain(
     toolchain_type = ":toolchain_type",
 )
 
+cc_toolchain(
+    name = "cc-compiler-mips64",
+    all_files = ":empty",
+    ar_files = ":empty",
+    as_files = ":empty",
+    compiler_files = ":empty",
+    dwp_files = ":empty",
+    linker_files = ":empty",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    supports_param_files = 1,
+    toolchain_config = ":local_linux",
+    toolchain_identifier = "local_linux",
+)
+
+toolchain(
+    name = "cc-toolchain-mips64",
+    exec_compatible_with = [
+        "@platforms//cpu:mips64",
+    ],
+    target_compatible_with = [
+        "@platforms//cpu:mips64",
+    ],
+    toolchain = ":cc-compiler-mips64",
+    toolchain_type = ":toolchain_type",
+)
+
+cc_toolchain(
+    name = "cc-compiler-riscv64",
+    all_files = ":empty",
+    ar_files = ":empty",
+    as_files = ":empty",
+    compiler_files = ":empty",
+    dwp_files = ":empty",
+    linker_files = ":empty",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    supports_param_files = 1,
+    toolchain_config = ":local_linux",
+    toolchain_identifier = "local_linux",
+)
+
+toolchain(
+    name = "cc-toolchain-riscv64",
+    exec_compatible_with = [
+        "@platforms//cpu:riscv64",
+    ],
+    target_compatible_with = [
+        "@platforms//cpu:riscv64",
+    ],
+    toolchain = ":cc-compiler-riscv64",
+    toolchain_type = ":toolchain_type",
+)
+
 cc_toolchain(
     name = "cc-compiler-armeabi-v7a",
     all_files = ":empty",

tools/cpp/lib_cc_configure.bzl

@@ -197,6 +197,10 @@ def get_cpu_value(repository_ctx):
         return "ppc"
     if result.stdout.strip() in ["s390x"]:
         return "s390x"
+    if result.stdout.strip() in ["mips64"]:
+        return "mips64"
+    if result.stdout.strip() in ["riscv64"]:
+        return "riscv64"
     if result.stdout.strip() in ["arm", "armv7l"]:
         return "arm"
     if result.stdout.strip() in ["aarch64"]:

tools/jdk/BUILD.tools

@@ -100,6 +100,8 @@ cc_library(
         "//src/conditions:linux_aarch64": [":jni_md_header-linux"],
         "//src/conditions:linux_ppc64le": [":jni_md_header-linux"],
         "//src/conditions:linux_s390x": [":jni_md_header-linux"],
+        "//src/conditions:linux_mips64": [":jni_md_header-linux"],
+        "//src/conditions:linux_riscv64": [":jni_md_header-linux"],
         "//src/conditions:linux_x86_64": [":jni_md_header-linux"],
         "//src/conditions:darwin": [":jni_md_header-darwin"],
         "//src/conditions:freebsd": [":jni_md_header-freebsd"],
@@ -111,6 +113,8 @@ cc_library(
         "//src/conditions:linux_aarch64": ["include/linux"],
         "//src/conditions:linux_ppc64le": ["include/linux"],
         "//src/conditions:linux_s390x": ["include/linux"],
+        "//src/conditions:linux_mips64": [":include/linux"],
+        "//src/conditions:linux_riscv64": [":include/linux"],
         "//src/conditions:linux_x86_64": ["include/linux"],
         "//src/conditions:darwin": ["include/darwin"],
         "//src/conditions:freebsd": ["include/freebsd"],

tools/platforms/BUILD

@@ -53,6 +53,16 @@ alias(
     actual = "@platforms//cpu:s390x",
 )
 
+alias(
+    name = "mips64",
+    actual = "@platforms//cpu:mips64",
+)
+
+alias(
+    name = "riscv64",
+    actual = "@platforms//cpu:riscv64",
+)
+
 alias(
     name = "os",
     actual = "@platforms//os:os",
@@ -109,6 +119,8 @@ platform(
         "@platforms//cpu:arm",
         "@platforms//cpu:aarch64",
         "@platforms//cpu:s390x",
+        "@platforms//cpu:mips64",
+        "@platforms//cpu:riscv64",
     ],
     host_platform = True,
     os_constraints = [
@@ -131,6 +143,8 @@ platform(
         "@platforms//cpu:arm",
         "@platforms//cpu:aarch64",
         "@platforms//cpu:s390x",
+        "@platforms//cpu:mips64",
+        "@platforms//cpu:riscv64",
     ],
     os_constraints = [
         "@platforms//os:osx",

tools/platforms/BUILD.tools

@@ -41,6 +41,16 @@ alias(
     actual = "@platforms//cpu:s390x",
 )
 
+alias(
+    name = "mips64",
+    actual = "@platforms//cpu:mips64",
+)
+
+alias(
+    name = "riscv64",
+    actual = "@platforms//cpu:riscv64",
+)
+
 alias(
     name = "os",
     actual = "@platforms//os:os",
@@ -97,6 +107,8 @@ platform(
         "@platforms//cpu:arm",
         "@platforms//cpu:aarch64",
         "@platforms//cpu:s390x",
+        "@platforms//cpu:mips64",
+        "@platforms//cpu:riscv64",
     ],
     host_platform = True,
     os_constraints = [
@@ -119,6 +131,8 @@ platform(
         "@platforms//cpu:arm",
         "@platforms//cpu:aarch64",
         "@platforms//cpu:s390x",
+        "@platforms//cpu:mips64",
+        "@platforms//cpu:riscv64",
     ],
     os_constraints = [
         "@platforms//os:osx",