Skip to content

Commit c066bf6

Browse files
rust-bors[bot]rust-bors[bot]
authored
Auto merge of #142682 - Gankra:update_musl_1.2.5, r=<try>
Update bundled musl to 1.2.5 Update the bundled musl library from 1.2.3 to the 1.2.5 release from February 29, 2024. * mcp: rust-lang/compiler-team#887 * blog: rust-lang/blog.rust-lang.org#1641 * Prior update: #107129 * [musl releases page](https://musl.libc.org/releases.html) -------- This is a rebase of * #125692 Which removes the second speculative commit which ended up not panning out. I've added my own second commit that updates all other places I could find that referenced musl 1.2.3 in the codebase. try-job: dist-x86_64-musl try-job: dist-i586-gnu-i586-i686-musl try-job: dist-x86_64-linux
2 parents 8de4c72 + 1926e11 commit c066bf6

26 files changed

+53
-53
lines changed

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub(crate) fn target() -> Target {
2020
Target {
2121
llvm_target: "aarch64-unknown-linux-musl".into(),
2222
metadata: TargetMetadata {
23-
description: Some("ARM64 Linux with musl 1.2.3".into()),
23+
description: Some("ARM64 Linux with musl 1.2.5".into()),
2424
tier: Some(2),
2525
host_tools: Some(true),
2626
std: Some(true),

‎compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "arm-unknown-linux-musleabi".into(),
66
metadata: TargetMetadata {
7-
description: Some("Armv6 Linux with musl 1.2.3".into()),
7+
description: Some("Armv6 Linux with musl 1.2.5".into()),
88
tier: Some(2),
99
host_tools: Some(false),
1010
std: Some(true),

‎compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "arm-unknown-linux-musleabihf".into(),
66
metadata: TargetMetadata {
7-
description: Some("Armv6 Linux with musl 1.2.3, hardfloat".into()),
7+
description: Some("Armv6 Linux with musl 1.2.5, hardfloat".into()),
88
tier: Some(2),
99
host_tools: Some(false),
1010
std: Some(true),

‎compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub(crate) fn target() -> Target {
44
Target {
55
llvm_target: "armv5te-unknown-linux-musleabi".into(),
66
metadata: TargetMetadata {
7-
description: Some("Armv5TE Linux with musl 1.2.3".into()),
7+
description: Some("Armv5TE Linux with musl 1.2.5".into()),
88
tier: Some(2),
99
host_tools: Some(false),
1010
std: Some(true),

‎compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub(crate) fn target() -> Target {
99
Target {
1010
llvm_target: "armv7-unknown-linux-musleabi".into(),
1111
metadata: TargetMetadata {
12-
description: Some("Armv7-A Linux with musl 1.2.3".into()),
12+
description: Some("Armv7-A Linux with musl 1.2.5".into()),
1313
tier: Some(2),
1414
host_tools: Some(false),
1515
std: Some(true),

‎compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
66
Target {
77
llvm_target: "armv7-unknown-linux-musleabihf".into(),
88
metadata: TargetMetadata {
9-
description: Some("Armv7-A Linux with musl 1.2.3, hardfloat".into()),
9+
description: Some("Armv7-A Linux with musl 1.2.5, hardfloat".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),
1212
std: Some(true),

‎compiler/rustc_target/src/spec/targets/hexagon_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
1616
Target {
1717
llvm_target: "hexagon-unknown-linux-musl".into(),
1818
metadata: TargetMetadata {
19-
description: Some("Hexagon Linux with musl 1.2.3".into()),
19+
description: Some("Hexagon Linux with musl 1.2.5".into()),
2020
tier: Some(3),
2121
host_tools: Some(false),
2222
std: Some(true),

‎compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn target() -> Target {
3131
Target {
3232
llvm_target: "i686-unknown-linux-musl".into(),
3333
metadata: TargetMetadata {
34-
description: Some("32-bit Linux with musl 1.2.3".into()),
34+
description: Some("32-bit Linux with musl 1.2.5".into()),
3535
tier: Some(2),
3636
host_tools: Some(false),
3737
std: Some(true),

‎compiler/rustc_target/src/spec/targets/mips64_openwrt_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub(crate) fn target() -> Target {
1414
// LLVM doesn't recognize "muslabi64" yet.
1515
llvm_target: "mips64-unknown-linux-musl".into(),
1616
metadata: TargetMetadata {
17-
description: Some("MIPS64 for OpenWrt Linux musl 1.2.3".into()),
17+
description: Some("MIPS64 for OpenWrt Linux musl 1.2.5".into()),
1818
tier: Some(3),
1919
host_tools: Some(false),
2020
std: Some(true),

‎compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(crate) fn target() -> Target {
1111
// LLVM doesn't recognize "muslabi64" yet.
1212
llvm_target: "mips64-unknown-linux-musl".into(),
1313
metadata: TargetMetadata {
14-
description: Some("MIPS64 Linux, N64 ABI, musl 1.2.3".into()),
14+
description: Some("MIPS64 Linux, N64 ABI, musl 1.2.5".into()),
1515
tier: Some(3),
1616
host_tools: Some(false),
1717
std: Some(true),

‎compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub(crate) fn target() -> Target {
1111
// LLVM doesn't recognize "muslabi64" yet.
1212
llvm_target: "mips64el-unknown-linux-musl".into(),
1313
metadata: TargetMetadata {
14-
description: Some("MIPS64 Linux, N64 ABI, musl 1.2.3".into()),
14+
description: Some("MIPS64 Linux, N64 ABI, musl 1.2.5".into()),
1515
tier: Some(3),
1616
host_tools: Some(false),
1717
std: Some(true),

‎compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
Target {
1111
llvm_target: "mips-unknown-linux-musl".into(),
1212
metadata: TargetMetadata {
13-
description: Some("MIPS Linux with musl 1.2.3".into()),
13+
description: Some("MIPS Linux with musl 1.2.5".into()),
1414
tier: Some(3),
1515
host_tools: Some(false),
1616
std: Some(true),

‎compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
88
Target {
99
llvm_target: "mipsel-unknown-linux-musl".into(),
1010
metadata: TargetMetadata {
11-
description: Some("MIPS (little endian) Linux with musl 1.2.3".into()),
11+
description: Some("MIPS (little endian) Linux with musl 1.2.5".into()),
1212
tier: Some(3),
1313
host_tools: Some(false),
1414
std: Some(true),

‎compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
Target {
1818
llvm_target: "powerpc64-unknown-linux-musl".into(),
1919
metadata: TargetMetadata {
20-
description: Some("64-bit PowerPC Linux with musl 1.2.3".into()),
20+
description: Some("64-bit PowerPC Linux with musl 1.2.5".into()),
2121
tier: Some(3),
2222
host_tools: Some(false),
2323
std: Some(true),

‎compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
Target {
1616
llvm_target: "powerpc64le-unknown-linux-musl".into(),
1717
metadata: TargetMetadata {
18-
description: Some("64-bit PowerPC Linux with musl 1.2.3, Little Endian".into()),
18+
description: Some("64-bit PowerPC Linux with musl 1.2.5, Little Endian".into()),
1919
tier: Some(2),
2020
host_tools: Some(true),
2121
std: Some(true),

‎compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
Target {
1616
llvm_target: "powerpc-unknown-linux-musl".into(),
1717
metadata: TargetMetadata {
18-
description: Some("PowerPC Linux with musl 1.2.3".into()),
18+
description: Some("PowerPC Linux with musl 1.2.5".into()),
1919
tier: Some(3),
2020
host_tools: Some(false),
2121
std: Some(true),

‎compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub(crate) fn target() -> Target {
77
llvm_target: "riscv32-unknown-linux-musl".into(),
88
metadata: TargetMetadata {
99
description: Some(
10-
"RISC-V Linux (kernel 5.4, musl 1.2.3 + RISCV32 support patches".into(),
10+
"RISC-V Linux (kernel 5.4, musl 1.2.5 + RISCV32 support patches".into(),
1111
),
1212
tier: Some(3),
1313
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
66
Target {
77
llvm_target: "riscv64-unknown-linux-musl".into(),
88
metadata: TargetMetadata {
9-
description: Some("RISC-V Linux (kernel 4.20, musl 1.2.3)".into()),
9+
description: Some("RISC-V Linux (kernel 4.20, musl 1.2.5)".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),
1212
std: Some(true),

‎compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
1919
Target {
2020
llvm_target: "s390x-unknown-linux-musl".into(),
2121
metadata: TargetMetadata {
22-
description: Some("S390x Linux (kernel 3.2, musl 1.2.3)".into()),
22+
description: Some("S390x Linux (kernel 3.2, musl 1.2.5)".into()),
2323
tier: Some(3),
2424
host_tools: Some(false),
2525
std: Some(true),

‎compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
1010
Target {
1111
llvm_target: "armv7-unknown-linux-musleabihf".into(),
1212
metadata: TargetMetadata {
13-
description: Some("Thumb2-mode ARMv7-A Linux with NEON, musl 1.2.3".into()),
13+
description: Some("Thumb2-mode ARMv7-A Linux with NEON, musl 1.2.5".into()),
1414
tier: Some(3),
1515
host_tools: Some(false),
1616
std: Some(true),

‎compiler/rustc_target/src/spec/targets/x86_64_unikraft_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
66
Target {
77
llvm_target: "x86_64-unknown-linux-musl".into(),
88
metadata: TargetMetadata {
9-
description: Some("64-bit Unikraft with musl 1.2.3".into()),
9+
description: Some("64-bit Unikraft with musl 1.2.5".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),
1212
std: Some(true),

‎compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn target() -> Target {
2222
Target {
2323
llvm_target: "x86_64-unknown-linux-musl".into(),
2424
metadata: TargetMetadata {
25-
description: Some("64-bit Linux with musl 1.2.3".into()),
25+
description: Some("64-bit Linux with musl 1.2.5".into()),
2626
tier: Some(2),
2727
host_tools: Some(true),
2828
std: Some(true),

‎src/ci/docker/scripts/musl-toolchain.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
66
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
7-
# Right now we have: Binutils 2.31.1, GCC 9.2.0, musl 1.2.3.
7+
# Right now we have: Binutils 2.31.1, GCC 9.2.0, musl 1.2.5.
88

99
# ignore-tidy-linelength
1010

@@ -45,11 +45,11 @@ export CFLAGS="-fPIC -g1 $CFLAGS"
4545

4646
git clone https://github.com/richfelker/musl-cross-make # -b v0.9.9
4747
cd musl-cross-make
48-
# A version that includes support for building musl 1.2.3
49-
git checkout fe915821b652a7fa37b34a596f47d8e20bc72338
48+
# A version that includes support for building musl 1.2.5
49+
git checkout e149c31c48b4f4a4c9349ddf7bc0027b90245afc
5050

51-
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER
52-
hide_output make install TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER OUTPUT=$OUTPUT
51+
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.2.5 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER
52+
hide_output make install TARGET=$TARGET MUSL_VER=1.2.5 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER OUTPUT=$OUTPUT
5353

5454
cd -
5555

‎src/ci/docker/scripts/musl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ shift
2525
# Apparently applying `-fPIC` everywhere allows them to link successfully.
2626
export CFLAGS="-fPIC $CFLAGS"
2727

28-
MUSL=musl-1.2.3
28+
MUSL=musl-1.2.5
2929

3030
# may have been downloaded in a previous run
3131
if [ ! -d $MUSL ]; then

0 commit comments

Comments
 (0)