Add loongarch64-unknown-linux-musl support

heiher · rami3l · commit 78ddd93f8bdc · 2024-07-05T14:27:01.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -608,9 +608,9 @@ jobs:
           - x86_64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
-          - aarch64-unknown-linux-gnu     # skip-pr
-          - powerpc64-unknown-linux-gnu   # skip-pr
-          - x86_64-unknown-linux-musl     # skip-pr
+          - aarch64-unknown-linux-gnu      # skip-pr
+          - powerpc64-unknown-linux-gnu    # skip-pr
+          - x86_64-unknown-linux-musl      # skip-pr
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
@@ -757,24 +757,24 @@ jobs:
           - x86_64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
-          - aarch64-unknown-linux-gnu     # skip-pr
-          - aarch64-unknown-linux-musl    # skip-pr skip-master
-          - powerpc64-unknown-linux-gnu   # skip-pr
-          - x86_64-unknown-linux-musl     # skip-pr
-          - i686-unknown-linux-gnu        # skip-pr skip-master
-          - arm-unknown-linux-gnueabi     # skip-pr skip-master
-          - arm-unknown-linux-gnueabihf   # skip-pr skip-master
-          - x86_64-unknown-freebsd        # skip-pr skip-master
-          - x86_64-unknown-netbsd         # skip-pr skip-master
-          - x86_64-unknown-illumos        # skip-pr skip-master
-          - powerpc-unknown-linux-gnu     # skip-pr skip-master
-          - powerpc64le-unknown-linux-gnu # skip-pr skip-master
-          - s390x-unknown-linux-gnu       # skip-pr skip-master
-          - arm-linux-androideabi         # skip-pr skip-master
-          - armv7-linux-androideabi       # skip-pr skip-master
-          - x86_64-linux-android          # skip-pr skip-master
-          - riscv64gc-unknown-linux-gnu   # skip-pr skip-master
-          - loongarch64-unknown-linux-gnu # skip-pr skip-master
+          - aarch64-unknown-linux-gnu      # skip-pr
+          - aarch64-unknown-linux-musl     # skip-pr skip-master
+          - powerpc64-unknown-linux-gnu    # skip-pr
+          - x86_64-unknown-linux-musl      # skip-pr
+          - i686-unknown-linux-gnu         # skip-pr skip-master
+          - arm-unknown-linux-gnueabi      # skip-pr skip-master
+          - arm-unknown-linux-gnueabihf    # skip-pr skip-master
+          - x86_64-unknown-freebsd         # skip-pr skip-master
+          - x86_64-unknown-netbsd          # skip-pr skip-master
+          - x86_64-unknown-illumos         # skip-pr skip-master
+          - powerpc-unknown-linux-gnu      # skip-pr skip-master
+          - powerpc64le-unknown-linux-gnu  # skip-pr skip-master
+          - s390x-unknown-linux-gnu        # skip-pr skip-master
+          - arm-linux-androideabi          # skip-pr skip-master
+          - armv7-linux-androideabi        # skip-pr skip-master
+          - x86_64-linux-android           # skip-pr skip-master
+          - riscv64gc-unknown-linux-gnu    # skip-pr skip-master
+          - loongarch64-unknown-linux-gnu  # skip-pr skip-master
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
@@ -19,24 +19,25 @@ jobs: # skip-master skip-pr skip-stable
           - x86_64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
-          - aarch64-unknown-linux-gnu     # skip-pr
-          - aarch64-unknown-linux-musl    # skip-pr skip-master
-          - powerpc64-unknown-linux-gnu   # skip-pr
-          - x86_64-unknown-linux-musl     # skip-pr
-          - i686-unknown-linux-gnu        # skip-pr skip-master
-          - arm-unknown-linux-gnueabi     # skip-pr skip-master
-          - arm-unknown-linux-gnueabihf   # skip-pr skip-master
-          - x86_64-unknown-freebsd        # skip-pr skip-master
-          - x86_64-unknown-netbsd         # skip-pr skip-master
-          - x86_64-unknown-illumos        # skip-pr skip-master
-          - powerpc-unknown-linux-gnu     # skip-pr skip-master
-          - powerpc64le-unknown-linux-gnu # skip-pr skip-master
-          - s390x-unknown-linux-gnu       # skip-pr skip-master
-          - arm-linux-androideabi         # skip-pr skip-master
-          - armv7-linux-androideabi       # skip-pr skip-master
-          - x86_64-linux-android          # skip-pr skip-master
-          - riscv64gc-unknown-linux-gnu   # skip-pr skip-master
-          - loongarch64-unknown-linux-gnu # skip-pr skip-master
+          - aarch64-unknown-linux-gnu      # skip-pr
+          - aarch64-unknown-linux-musl     # skip-pr skip-master
+          - powerpc64-unknown-linux-gnu    # skip-pr
+          - x86_64-unknown-linux-musl      # skip-pr
+          - i686-unknown-linux-gnu         # skip-pr skip-master
+          - arm-unknown-linux-gnueabi      # skip-pr skip-master
+          - arm-unknown-linux-gnueabihf    # skip-pr skip-master
+          - x86_64-unknown-freebsd         # skip-pr skip-master
+          - x86_64-unknown-netbsd          # skip-pr skip-master
+          - x86_64-unknown-illumos         # skip-pr skip-master
+          - powerpc-unknown-linux-gnu      # skip-pr skip-master
+          - powerpc64le-unknown-linux-gnu  # skip-pr skip-master
+          - s390x-unknown-linux-gnu        # skip-pr skip-master
+          - arm-linux-androideabi          # skip-pr skip-master
+          - armv7-linux-androideabi        # skip-pr skip-master
+          - x86_64-linux-android           # skip-pr skip-master
+          - riscv64gc-unknown-linux-gnu    # skip-pr skip-master
+          - loongarch64-unknown-linux-gnu  # skip-pr skip-master
+          - loongarch64-unknown-linux-musl # skip-pr skip-master skip-stable
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
diff --git a/ci/cloudfront-invalidation.txt b/ci/cloudfront-invalidation.txt
@@ -33,6 +33,8 @@ rustup/dist/i686-unknown-linux-gnu/rustup-init
 rustup/dist/i686-unknown-linux-gnu/rustup-init.sha256
 rustup/dist/loongarch64-unknown-linux-gnu/rustup-init
 rustup/dist/loongarch64-unknown-linux-gnu/rustup-init.sha256
+rustup/dist/loongarch64-unknown-linux-musl/rustup-init
+rustup/dist/loongarch64-unknown-linux-musl/rustup-init.sha256
 rustup/dist/mips-unknown-linux-gnu/rustup-init
 rustup/dist/mips-unknown-linux-gnu/rustup-init.sha256
 rustup/dist/mips64-unknown-linux-gnuabi64/rustup-init
diff --git a/ci/docker/loongarch64-unknown-linux-musl/Dockerfile b/ci/docker/loongarch64-unknown-linux-musl/Dockerfile
@@ -0,0 +1,4 @@
+FROM rust-loongarch64-unknown-linux-musl
+
+ENV CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \
+    CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=loongarch64-unknown-linux-musl-gcc
diff --git a/ci/fetch-rust-docker.bash b/ci/fetch-rust-docker.bash
@@ -42,6 +42,7 @@ case "$TARGET" in
   x86_64-unknown-netbsd)           image=dist-x86_64-netbsd ;;
   riscv64gc-unknown-linux-gnu)     image=dist-riscv64-linux ;;
   loongarch64-unknown-linux-gnu)   image=dist-loongarch64-linux ;;
+  loongarch64-unknown-linux-musl)  image=dist-loongarch64-musl ;;
   *) exit ;;
 esac
 
diff --git a/doc/user-guide/src/installation/other.md b/doc/user-guide/src/installation/other.md
@@ -104,6 +104,8 @@ You can manually download `rustup-init` for a given target from
   - [sha256 file](https://static.rust-lang.org/rustup/dist/i686-unknown-linux-gnu/rustup-init.sha256)
 - [loongarch64-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/loongarch64-unknown-linux-gnu/rustup-init)
   - [sha256 file](https://static.rust-lang.org/rustup/dist/loongarch64-unknown-linux-gnu/rustup-init.sha256)
+- [loongarch64-unknown-linux-musl](https://static.rust-lang.org/rustup/dist/loongarch64-unknown-linux-musl/rustup-init)
+  - [sha256 file](https://static.rust-lang.org/rustup/dist/loongarch64-unknown-linux-musl/rustup-init.sha256)
 - [mips-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/mips-unknown-linux-gnu/rustup-init)
   - [sha256 file](https://static.rust-lang.org/rustup/dist/mips-unknown-linux-gnu/rustup-init.sha256)
 - [mips64-unknown-linux-gnuabi64](https://static.rust-lang.org/rustup/dist/mips64-unknown-linux-gnuabi64/rustup-init)
diff --git a/src/dist/mod.rs b/src/dist/mod.rs
@@ -247,6 +247,10 @@ const TRIPLE_X86_64_UNKNOWN_LINUX: &str = "x86_64-unknown-linux-musl";
 const TRIPLE_AARCH64_UNKNOWN_LINUX: &str = "aarch64-unknown-linux-gnu";
 #[cfg(all(not(windows), target_env = "musl"))]
 const TRIPLE_AARCH64_UNKNOWN_LINUX: &str = "aarch64-unknown-linux-musl";
+#[cfg(all(not(windows), not(target_env = "musl")))]
+const TRIPLE_LOONGARCH64_UNKNOWN_LINUX: &str = "loongarch64-unknown-linux-gnu";
+#[cfg(all(not(windows), target_env = "musl"))]
+const TRIPLE_LOONGARCH64_UNKNOWN_LINUX: &str = "loongarch64-unknown-linux-musl";
 
 // MIPS platforms don't indicate endianness in uname, however binaries only
 // run on boxes with the same endianness, as expected.
@@ -503,6 +507,7 @@ impl TargetTriple {
                 } else {
                     TRIPLE_AARCH64_UNKNOWN_LINUX
                 }),
+                (b"Linux", b"loongarch64") => Some(TRIPLE_LOONGARCH64_UNKNOWN_LINUX),
                 (b"Darwin", b"x86_64") => Some("x86_64-apple-darwin"),
                 (b"Darwin", b"i686") => Some("i686-apple-darwin"),
                 (b"FreeBSD", b"x86_64") => Some("x86_64-unknown-freebsd"),
