Skip to content

Commit 14bf8cb

Browse files
borsbors
committed
Auto merge of #125692 - est31:update_musl_1.2.5, r=<try>
Update bundled musl to 1.2.5 [Releases page](https://musl.libc.org/releases.html) Prior update: #107129 r? `@wesleywiser` try-job: dist-x86_64-musl try-job: dist-i586-gnu-i586-i686-musl
2 parents 7516912 + 2173f48 commit 14bf8cb

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

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

+5-5
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

+1-1
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

‎src/doc/rustc/src/platform-support.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ target | notes
8888
-------|-------
8989
[`aarch64-apple-darwin`](platform-support/apple-darwin.md) | ARM64 macOS (11.0+, Big Sur+)
9090
`aarch64-pc-windows-msvc` | ARM64 Windows MSVC
91-
`aarch64-unknown-linux-musl` | ARM64 Linux with musl 1.2.3
91+
`aarch64-unknown-linux-musl` | ARM64 Linux with musl 1.2.5
9292
`arm-unknown-linux-gnueabi` | Armv6 Linux (kernel 3.2, glibc 2.17)
9393
`arm-unknown-linux-gnueabihf` | Armv6 Linux, hardfloat (kernel 3.2, glibc 2.17)
9494
`armv7-unknown-linux-gnueabihf` | Armv7-A Linux, hardfloat (kernel 3.2, glibc 2.17)
@@ -100,7 +100,7 @@ target | notes
100100
`s390x-unknown-linux-gnu` | S390x Linux (kernel 3.2, glibc 2.17)
101101
`x86_64-unknown-freebsd` | 64-bit FreeBSD
102102
`x86_64-unknown-illumos` | illumos
103-
`x86_64-unknown-linux-musl` | 64-bit Linux with musl 1.2.3
103+
`x86_64-unknown-linux-musl` | 64-bit Linux with musl 1.2.5
104104
[`x86_64-unknown-netbsd`](platform-support/netbsd.md) | NetBSD/amd64
105105

106106
## Tier 2 without Host Tools
@@ -144,27 +144,27 @@ target | std | notes
144144
`aarch64-unknown-none` | * | Bare ARM64, hardfloat
145145
[`aarch64-unknown-uefi`](platform-support/unknown-uefi.md) | ? | ARM64 UEFI
146146
[`arm-linux-androideabi`](platform-support/android.md) | ✓ | Armv6 Android
147-
`arm-unknown-linux-musleabi` | ✓ | Armv6 Linux with musl 1.2.3
148-
`arm-unknown-linux-musleabihf` | ✓ | Armv6 Linux with musl 1.2.3, hardfloat
147+
`arm-unknown-linux-musleabi` | ✓ | Armv6 Linux with musl 1.2.5
148+
`arm-unknown-linux-musleabihf` | ✓ | Armv6 Linux with musl 1.2.5, hardfloat
149149
[`armebv7r-none-eabi`](platform-support/armv7r-none-eabi.md) | * | Bare Armv7-R, Big Endian
150150
[`armebv7r-none-eabihf`](platform-support/armv7r-none-eabi.md) | * | Bare Armv7-R, Big Endian, hardfloat
151151
`armv5te-unknown-linux-gnueabi` | ✓ | Armv5TE Linux (kernel 4.4, glibc 2.23)
152-
`armv5te-unknown-linux-musleabi` | ✓ | Armv5TE Linux with musl 1.2.3
152+
`armv5te-unknown-linux-musleabi` | ✓ | Armv5TE Linux with musl 1.2.5
153153
[`armv7-linux-androideabi`](platform-support/android.md) | ✓ | Armv7-A Android
154154
`armv7-unknown-linux-gnueabi` | ✓ | Armv7-A Linux (kernel 4.15, glibc 2.27)
155-
`armv7-unknown-linux-musleabi` | ✓ | Armv7-A Linux with musl 1.2.3
156-
`armv7-unknown-linux-musleabihf` | ✓ | Armv7-A Linux with musl 1.2.3, hardfloat
155+
`armv7-unknown-linux-musleabi` | ✓ | Armv7-A Linux with musl 1.2.5
156+
`armv7-unknown-linux-musleabihf` | ✓ | Armv7-A Linux with musl 1.2.5, hardfloat
157157
[`armv7-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | Armv7-A OpenHarmony
158158
[`armv7a-none-eabi`](platform-support/arm-none-eabi.md) | * | Bare Armv7-A
159159
[`armv7r-none-eabi`](platform-support/armv7r-none-eabi.md) | * | Bare Armv7-R
160160
[`armv7r-none-eabihf`](platform-support/armv7r-none-eabi.md) | * | Bare Armv7-R, hardfloat
161161
`i586-pc-windows-msvc` | * | 32-bit Windows w/o SSE [^x86_32-floats-x87]
162162
`i586-unknown-linux-gnu` | ✓ | 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17) [^x86_32-floats-x87]
163-
`i586-unknown-linux-musl` | ✓ | 32-bit Linux w/o SSE, musl 1.2.3 [^x86_32-floats-x87]
163+
`i586-unknown-linux-musl` | ✓ | 32-bit Linux w/o SSE, musl 1.2.5 [^x86_32-floats-x87]
164164
[`i686-linux-android`](platform-support/android.md) | ✓ | 32-bit x86 Android [^x86_32-floats-return-ABI]
165165
[`i686-pc-windows-gnullvm`](platform-support/pc-windows-gnullvm.md) | ✓ | 32-bit x86 MinGW (Windows 10+), LLVM ABI [^x86_32-floats-return-ABI]
166166
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD [^x86_32-floats-return-ABI]
167-
`i686-unknown-linux-musl` | ✓ | 32-bit Linux with musl 1.2.3 [^x86_32-floats-return-ABI]
167+
`i686-unknown-linux-musl` | ✓ | 32-bit Linux with musl 1.2.5 [^x86_32-floats-return-ABI]
168168
[`i686-unknown-uefi`](platform-support/unknown-uefi.md) | ? | 32-bit UEFI
169169
[`loongarch64-unknown-none`](platform-support/loongarch-none.md) | * | | LoongArch64 Bare-metal (LP64D ABI)
170170
[`loongarch64-unknown-none-softfloat`](platform-support/loongarch-none.md) | * | | LoongArch64 Bare-metal (LP64S ABI)
@@ -291,7 +291,7 @@ target | std | host | notes
291291
`csky-unknown-linux-gnuabiv2` | ✓ | | C-SKY abiv2 Linux (little endian)
292292
`csky-unknown-linux-gnuabiv2hf` | ✓ | | C-SKY abiv2 Linux, hardfloat (little endian)
293293
[`hexagon-unknown-none-elf`](platform-support/hexagon-unknown-none-elf.md)| * | | Bare Hexagon (v60+, HVX)
294-
[`hexagon-unknown-linux-musl`](platform-support/hexagon-unknown-linux-musl.md) | ✓ | | Hexagon Linux with musl 1.2.3
294+
[`hexagon-unknown-linux-musl`](platform-support/hexagon-unknown-linux-musl.md) | ✓ | | Hexagon Linux with musl 1.2.5
295295
[`i386-apple-ios`](platform-support/apple-ios.md) | ✓ | | 32-bit x86 iOS [^x86_32-floats-return-ABI]
296296
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS [^x86_32-floats-return-ABI]
297297
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86, restricted to Pentium
@@ -304,18 +304,18 @@ target | std | host | notes
304304
`i686-uwp-windows-msvc` | ? | | [^x86_32-floats-return-ABI]
305305
[`i686-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]
306306
`i686-wrs-vxworks` | ? | | [^x86_32-floats-return-ABI]
307-
[`loongarch64-unknown-linux-musl`](platform-support/loongarch-linux.md) | ? | | LoongArch64 Linux (LP64D ABI) with musl 1.2.3
307+
[`loongarch64-unknown-linux-musl`](platform-support/loongarch-linux.md) | ? | | LoongArch64 Linux (LP64D ABI) with musl 1.2.5
308308
[`m68k-unknown-linux-gnu`](platform-support/m68k-unknown-linux-gnu.md) | ? | | Motorola 680x0 Linux
309309
`mips-unknown-linux-gnu` | ✓ | ✓ | MIPS Linux (kernel 4.4, glibc 2.23)
310-
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with musl 1.2.3
310+
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with musl 1.2.5
311311
`mips-unknown-linux-uclibc` | ✓ | | MIPS Linux with uClibc
312-
[`mips64-openwrt-linux-musl`](platform-support/mips64-openwrt-linux-musl.md) | ? | | MIPS64 for OpenWrt Linux musl 1.2.3
312+
[`mips64-openwrt-linux-musl`](platform-support/mips64-openwrt-linux-musl.md) | ? | | MIPS64 for OpenWrt Linux musl 1.2.5
313313
`mips64-unknown-linux-gnuabi64` | ✓ | ✓ | MIPS64 Linux, N64 ABI (kernel 4.4, glibc 2.23)
314-
`mips64-unknown-linux-muslabi64` | ✓ | | MIPS64 Linux, N64 ABI, musl 1.2.3
314+
`mips64-unknown-linux-muslabi64` | ✓ | | MIPS64 Linux, N64 ABI, musl 1.2.5
315315
`mips64el-unknown-linux-gnuabi64` | ✓ | ✓ | MIPS64 (little endian) Linux, N64 ABI (kernel 4.4, glibc 2.23)
316-
`mips64el-unknown-linux-muslabi64` | ✓ | | MIPS64 (little endian) Linux, N64 ABI, musl 1.2.3
316+
`mips64el-unknown-linux-muslabi64` | ✓ | | MIPS64 (little endian) Linux, N64 ABI, musl 1.2.5
317317
`mipsel-unknown-linux-gnu` | ✓ | ✓ | MIPS (little endian) Linux (kernel 4.4, glibc 2.23)
318-
`mipsel-unknown-linux-musl` | ✓ | | MIPS (little endian) Linux with musl 1.2.3
318+
`mipsel-unknown-linux-musl` | ✓ | | MIPS (little endian) Linux with musl 1.2.5
319319
[`mipsel-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | 32-bit MIPS (LE), requires mips32 cpu support
320320
`mipsel-sony-psp` | * | | MIPS (LE) Sony PlayStation Portable (PSP)
321321
[`mipsel-sony-psx`](platform-support/mipsel-sony-psx.md) | * | | MIPS (LE) Sony PlayStation 1 (PSX)
@@ -327,21 +327,21 @@ target | std | host | notes
327327
[`mipsisa64r6el-unknown-linux-gnuabi64`](platform-support/mips-release-6.md) | ✓ | ✓ | 64-bit MIPS Release 6 Little Endian
328328
`msp430-none-elf` | * | | 16-bit MSP430 microcontrollers
329329
`powerpc-unknown-linux-gnuspe` | ✓ | | PowerPC SPE Linux
330-
`powerpc-unknown-linux-musl` | ? | | PowerPC Linux with musl 1.2.3
330+
`powerpc-unknown-linux-musl` | ? | | PowerPC Linux with musl 1.2.5
331331
[`powerpc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD 32-bit powerpc systems
332332
`powerpc-unknown-openbsd` | ? | |
333333
`powerpc-wrs-vxworks-spe` | ? | |
334334
`powerpc-wrs-vxworks` | ? | |
335335
`powerpc64-unknown-freebsd` | ✓ | ✓ | PPC64 FreeBSD (ELFv1 and ELFv2)
336336
`powerpc64le-unknown-freebsd` | | | PPC64LE FreeBSD
337337
`powerpc-unknown-freebsd` | | | PowerPC FreeBSD
338-
`powerpc64-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.3
338+
`powerpc64-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.5
339339
`powerpc64-wrs-vxworks` | ? | |
340-
`powerpc64le-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.3, Little Endian
340+
`powerpc64le-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.5, Little Endian
341341
[`powerpc64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/powerpc64
342342
[`powerpc64-ibm-aix`](platform-support/aix.md) | ? | | 64-bit AIX (7.2 and newer)
343343
`riscv32gc-unknown-linux-gnu` | | | RISC-V Linux (kernel 5.4, glibc 2.33)
344-
`riscv32gc-unknown-linux-musl` | | | RISC-V Linux (kernel 5.4, musl 1.2.3 + RISCV32 support patches)
344+
`riscv32gc-unknown-linux-musl` | | | RISC-V Linux (kernel 5.4, musl 1.2.5 + RISCV32 support patches)
345345
[`riscv32im-risc0-zkvm-elf`](platform-support/riscv32im-risc0-zkvm-elf.md) | ? | | RISC Zero's zero-knowledge Virtual Machine (RV32IM ISA)
346346
[`riscv32ima-unknown-none-elf`](platform-support/riscv32-unknown-none-elf.md) | * | | Bare RISC-V (RV32IMA ISA)
347347
[`riscv32imac-unknown-xous-elf`](platform-support/riscv32imac-unknown-xous-elf.md) | ? | | RISC-V Xous (RV32IMAC ISA)
@@ -351,11 +351,11 @@ target | std | host | notes
351351
[`riscv64gc-unknown-hermit`](platform-support/hermit.md) | ✓ | | RISC-V Hermit
352352
`riscv64gc-unknown-freebsd` | | | RISC-V FreeBSD
353353
`riscv64gc-unknown-fuchsia` | | | RISC-V Fuchsia
354-
`riscv64gc-unknown-linux-musl` | | | RISC-V Linux (kernel 4.20, musl 1.2.3)
354+
`riscv64gc-unknown-linux-musl` | | | RISC-V Linux (kernel 4.20, musl 1.2.5)
355355
[`riscv64gc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | RISC-V NetBSD
356356
[`riscv64gc-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/riscv64
357357
[`riscv64-linux-android`](platform-support/android.md) | | | RISC-V 64-bit Android
358-
`s390x-unknown-linux-musl` | | | S390x Linux (kernel 3.2, musl 1.2.3)
358+
`s390x-unknown-linux-musl` | | | S390x Linux (kernel 3.2, musl 1.2.5)
359359
`sparc-unknown-linux-gnu` | ✓ | | 32-bit SPARC Linux
360360
[`sparc-unknown-none-elf`](./platform-support/sparc-unknown-none-elf.md) | * | | Bare 32-bit SPARC V7+
361361
[`sparc64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/sparc64
@@ -364,14 +364,14 @@ target | std | host | notes
364364
[`thumbv5te-none-eabi`](platform-support/armv5te-none-eabi.md) | * | | Thumb-mode Bare Armv5TE
365365
`thumbv7a-pc-windows-msvc` | ? | |
366366
`thumbv7a-uwp-windows-msvc` | ✓ | |
367-
`thumbv7neon-unknown-linux-musleabihf` | ? | | Thumb2-mode Armv7-A Linux with NEON, musl 1.2.3
367+
`thumbv7neon-unknown-linux-musleabihf` | ? | | Thumb2-mode Armv7-A Linux with NEON, musl 1.2.5
368368
[`wasm32-wasip2`](platform-support/wasm32-wasip2.md) | ✓ | | WebAssembly
369369
[`wasm64-unknown-unknown`](platform-support/wasm64-unknown-unknown.md) | ? | | WebAssembly
370370
[`x86_64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | | Apple Catalyst on x86_64
371371
[`x86_64-apple-tvos`](platform-support/apple-tvos.md) | ✓ | | x86 64-bit tvOS
372372
[`x86_64-apple-watchos-sim`](platform-support/apple-watchos.md) | ✓ | | x86 64-bit Apple WatchOS simulator
373373
[`x86_64-pc-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | x86 64-bit QNX Neutrino 7.1 RTOS |
374-
[`x86_64-unikraft-linux-musl`](platform-support/unikraft-linux-musl.md) | ✓ | | 64-bit Unikraft with musl 1.2.3
374+
[`x86_64-unikraft-linux-musl`](platform-support/unikraft-linux-musl.md) | ✓ | | 64-bit Unikraft with musl 1.2.5
375375
`x86_64-unknown-dragonfly` | ✓ | ✓ | 64-bit DragonFlyBSD
376376
`x86_64-unknown-haiku` | ✓ | ✓ | 64-bit Haiku
377377
[`x86_64-unknown-hermit`](platform-support/hermit.md) | ✓ | | x86_64 Hermit

0 commit comments

Comments
 (0)