ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6->7.0) by tgross35 · Pull Request #5215 · rust-lang/libc

tgross35 · 2026-06-24T21:09:51Z

Based on #5175

tgross35 · 2026-06-24T21:19:09Z

Needs rust-lang/ci-mirrors#34 and rust-lang/ci-mirrors#35

tgross35 · 2026-06-25T05:21:48Z

I did the paths wrong so this needs rust-lang/ci-mirrors#36, then should be good to go.

rustbot · 2026-06-25T05:23:03Z

Some changes occurred in an Android module

cc @maurer

Where possible, change to the latest Ubuntu release. The 32-bit images still aren't bumped because of the time64 mismatch.

Source: torvalds/linux@67890d5

Glibc 2.42 updated this definition to an unsigned integer so it no longer overflows. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=3263675250cbcbbcc76ede4f7c660418bd345a11

Glibc 2.43 adds the additional fields from Linux 6.17 to `struct tcp_info`. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=7e46c2aae47d3284d4eb0845ddcc3951e987d681

rustbot · 2026-06-29T18:58:38Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

In Ubuntu 26.04, the musl build hits: In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:51: /musl-aarch64/include/string.h:97:7: error: conflicting types for 'basename'; have 'char *(void)' 97 | char *basename(); | ^~~~~~~~ In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:19: /musl-aarch64/include/libgen.h:9:7: note: previous declaration of 'basename' with type 'char *(char *)' 9 | char *basename(char *); | ^~~~~~~~ cc1: note: unrecognized command-line option '-Wno-unknown-warning-option' may have been intended to silence earlier diagnostics I believe this may be due to a new error in recent versions of GCC, though I have not actually gone through the effort to verify this. In any case, musl received a patch in 1.2.5 that resolves the issue; apply it to our 1.1.x build to keep it working. Link: kraj/musl@725e17e

Where possible, change to the latest Ubuntu release. The 32-bit images still aren't bumped because of the time64 mismatch. (backport <rust-lang#5215>) (cherry picked from commit 836a774)

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

Glibc 2.42 updated this definition to an unsigned integer so it no longer overflows. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=3263675250cbcbbcc76ede4f7c660418bd345a11 (backport <rust-lang#5215>) (cherry picked from commit 5001b08)

Glibc 2.43 adds the additional fields from Linux 6.17 to `struct tcp_info`. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=7e46c2aae47d3284d4eb0845ddcc3951e987d681 (backport <rust-lang#5215>) (cherry picked from commit bfd993e)

In Ubuntu 26.04, the musl build hits: In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:51: /musl-aarch64/include/string.h:97:7: error: conflicting types for 'basename'; have 'char *(void)' 97 | char *basename(); | ^~~~~~~~ In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:19: /musl-aarch64/include/libgen.h:9:7: note: previous declaration of 'basename' with type 'char *(char *)' 9 | char *basename(char *); | ^~~~~~~~ cc1: note: unrecognized command-line option '-Wno-unknown-warning-option' may have been intended to silence earlier diagnostics I believe this may be due to a new error in recent versions of GCC, though I have not actually gone through the effort to verify this. In any case, musl received a patch in 1.2.5 that resolves the issue; apply it to our 1.1.x build to keep it working. Link: kraj/musl@725e17e (backport <rust-lang#5215>) (cherry picked from commit 2713f20)

Ubuntu 26.04 transitioned PowerPC64LE from the IBM long double format to IEEE binary128 [1], which mean a handful of variadic functions needed to switch to a binary128-compatible version. These were available starting with glibc 2.32 (2020-08) per the abilist [2], which is quite a bit newer than what we say we support at [3] (2.17, 2012-12). This explains test failures, so skip checking the functions per now. We should migrate to the `__<name>ieee128` functions at some point, which need not be related to our documented minimum, but there is no reason to do it now since Rust doesn't even stably support either IBM `long double` or binary128. Demo on Ubuntu 24.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __stack_chk_fail 0000000000000000 T demo U fprintf U printf U snprintf U sprintf U stderr U syslog And the same demo on Ubuntu 26.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __fprintfieee128 U __printfieee128 U __snprintfieee128 U __sprintfieee128 U __stack_chk_fail U __syslogieee128 0000000000000000 T demo U stderr [1]: https://bugs.launchpad.net/ubuntu/+bug/2132257 [2]: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist;h=65d78e50760b5d6b1a9cb39016a7bf8064224794;hb=HEAD#l2519 [3]: https://doc.rust-lang.org/1.96.0/rustc/platform-support.html (backport <rust-lang#5215>) (cherry picked from commit c7bca4c)

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

Where possible, change to the latest Ubuntu release. The 32-bit images still aren't bumped because of the time64 mismatch. (backport <rust-lang#5215>) (cherry picked from commit 836a774)

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

Glibc 2.42 updated this definition to an unsigned integer so it no longer overflows. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=3263675250cbcbbcc76ede4f7c660418bd345a11 (backport <rust-lang#5215>) (cherry picked from commit 5001b08)

Glibc 2.43 adds the additional fields from Linux 6.17 to `struct tcp_info`. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=7e46c2aae47d3284d4eb0845ddcc3951e987d681 (backport <rust-lang#5215>) (cherry picked from commit bfd993e)

In Ubuntu 26.04, the musl build hits: In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:51: /musl-aarch64/include/string.h:97:7: error: conflicting types for 'basename'; have 'char *(void)' 97 | char *basename(); | ^~~~~~~~ In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:19: /musl-aarch64/include/libgen.h:9:7: note: previous declaration of 'basename' with type 'char *(char *)' 9 | char *basename(char *); | ^~~~~~~~ cc1: note: unrecognized command-line option '-Wno-unknown-warning-option' may have been intended to silence earlier diagnostics I believe this may be due to a new error in recent versions of GCC, though I have not actually gone through the effort to verify this. In any case, musl received a patch in 1.2.5 that resolves the issue; apply it to our 1.1.x build to keep it working. Link: kraj/musl@725e17e (backport <rust-lang#5215>) (cherry picked from commit 2713f20)

Ubuntu 26.04 transitioned PowerPC64LE from the IBM long double format to IEEE binary128 [1], which mean a handful of variadic functions needed to switch to a binary128-compatible version. These were available starting with glibc 2.32 (2020-08) per the abilist [2], which is quite a bit newer than what we say we support at [3] (2.17, 2012-12). This explains test failures, so skip checking the functions per now. We should migrate to the `__<name>ieee128` functions at some point, which need not be related to our documented minimum, but there is no reason to do it now since Rust doesn't even stably support either IBM `long double` or binary128. Demo on Ubuntu 24.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __stack_chk_fail 0000000000000000 T demo U fprintf U printf U snprintf U sprintf U stderr U syslog And the same demo on Ubuntu 26.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __fprintfieee128 U __printfieee128 U __snprintfieee128 U __sprintfieee128 U __stack_chk_fail U __syslogieee128 0000000000000000 T demo U stderr [1]: https://bugs.launchpad.net/ubuntu/+bug/2132257 [2]: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist;h=65d78e50760b5d6b1a9cb39016a7bf8064224794;hb=HEAD#l2519 [3]: https://doc.rust-lang.org/1.96.0/rustc/platform-support.html (backport <rust-lang#5215>) (cherry picked from commit c7bca4c)

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

Where possible, change to the latest Ubuntu release. The 32-bit images still aren't bumped because of the time64 mismatch. (backport <rust-lang#5215>) (cherry picked from commit 836a774)

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

Glibc 2.42 updated this definition to an unsigned integer so it no longer overflows. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=3263675250cbcbbcc76ede4f7c660418bd345a11 (backport <rust-lang#5215>) (cherry picked from commit 5001b08)

Glibc 2.43 adds the additional fields from Linux 6.17 to `struct tcp_info`. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=7e46c2aae47d3284d4eb0845ddcc3951e987d681 (backport <rust-lang#5215>) (cherry picked from commit bfd993e)

In Ubuntu 26.04, the musl build hits: In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:51: /musl-aarch64/include/string.h:97:7: error: conflicting types for 'basename'; have 'char *(void)' 97 | char *basename(); | ^~~~~~~~ In file included from /checkout/target/aarch64-unknown-linux-musl/debug/build/libc-test-1eed7f417ef9e9ac/out/ctest_output.c:19: /musl-aarch64/include/libgen.h:9:7: note: previous declaration of 'basename' with type 'char *(char *)' 9 | char *basename(char *); | ^~~~~~~~ cc1: note: unrecognized command-line option '-Wno-unknown-warning-option' may have been intended to silence earlier diagnostics I believe this may be due to a new error in recent versions of GCC, though I have not actually gone through the effort to verify this. In any case, musl received a patch in 1.2.5 that resolves the issue; apply it to our 1.1.x build to keep it working. Link: kraj/musl@725e17e (backport <rust-lang#5215>) (cherry picked from commit 2713f20)

Ubuntu 26.04 transitioned PowerPC64LE from the IBM long double format to IEEE binary128 [1], which mean a handful of variadic functions needed to switch to a binary128-compatible version. These were available starting with glibc 2.32 (2020-08) per the abilist [2], which is quite a bit newer than what we say we support at [3] (2.17, 2012-12). This explains test failures, so skip checking the functions per now. We should migrate to the `__<name>ieee128` functions at some point, which need not be related to our documented minimum, but there is no reason to do it now since Rust doesn't even stably support either IBM `long double` or binary128. Demo on Ubuntu 24.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __stack_chk_fail 0000000000000000 T demo U fprintf U printf U snprintf U sprintf U stderr U syslog And the same demo on Ubuntu 26.04: $ cat demo.c #include <stdio.h> #include <syslog.h> void demo() { char buf1[20] = { 0 }; char buf2[20] = { 0 }; printf("Hello, world! %d\n", 1); fprintf(stderr, "Hello, world! %d\n", 2); sprintf(buf1, "Hello, world! %d\n", 3); snprintf(buf2, 20, "Hello, world! %d\n", 4); syslog(0, "Hello, world! %d\n", 5); } $ powerpc64le-linux-gnu-gcc demo.c -c $ powerpc64le-linux-gnu-nm demo.o U .TOC. U __fprintfieee128 U __printfieee128 U __snprintfieee128 U __sprintfieee128 U __stack_chk_fail U __syslogieee128 0000000000000000 T demo U stderr [1]: https://bugs.launchpad.net/ubuntu/+bug/2132257 [2]: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist;h=65d78e50760b5d6b1a9cb39016a7bf8064224794;hb=HEAD#l2519 [3]: https://doc.rust-lang.org/1.96.0/rustc/platform-support.html (backport <rust-lang#5215>) (cherry picked from commit c7bca4c)

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

rustbot added the A-CI Area: CI-related items label Jun 24, 2026

tgross35 mentioned this pull request Jun 25, 2026

Add musl and glibc bindings for getdents{,64} #4522

Open

3 tasks

tgross35 force-pushed the musl-bump branch 4 times, most recently from 21689af to 7685cd8 Compare June 25, 2026 05:11

tgross35 force-pushed the musl-bump branch from 7685cd8 to d5c1a5c Compare June 25, 2026 05:22

tgross35 marked this pull request as ready for review June 25, 2026 05:23

rustbot added the S-waiting-on-review label Jun 25, 2026

tgross35 mentioned this pull request Jun 25, 2026

Rename musl_v1_2_3 and RUST_LIBC_UNSTABLE_MUSL_V1_2_3 to musl_v1_2 and RUST_LIBC_UNSTABLE_MUSL_V1_2 #5200

Open

tgross35 force-pushed the musl-bump branch from d5c1a5c to 54017cd Compare June 25, 2026 19:21

This comment has been minimized.

Sign in to view

tgross35 force-pushed the musl-bump branch from 54017cd to 3566693 Compare June 25, 2026 19:30

This comment has been minimized.

Sign in to view

tgross35 force-pushed the musl-bump branch from 3566693 to cf32fda Compare June 26, 2026 06:08

This comment has been minimized.

Sign in to view

tgross35 force-pushed the musl-bump branch from cf32fda to b358cd6 Compare June 26, 2026 09:11

This comment has been minimized.

Sign in to view

tgross35 and others added 4 commits June 29, 2026 18:58

ci: Switch to ubuntu:26.04 images

1e711f0

Where possible, change to the latest Ubuntu release. The 32-bit images still aren't bumped because of the time64 mismatch.

linux: Update the value of SW_MAX and SW_CNT

52d8a5b

Source: torvalds/linux@67890d5

glibc: Update the value of MS_NOUSER

977368a

Glibc 2.42 updated this definition to an unsigned integer so it no longer overflows. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=3263675250cbcbbcc76ede4f7c660418bd345a11

glibc: Add new fields to struct tcp_info

8a9bf46

Glibc 2.43 adds the additional fields from Linux 6.17 to `struct tcp_info`. Source: https://sourceware.org/git/?p=glibc.git;a=commit;h=7e46c2aae47d3284d4eb0845ddcc3951e987d681

tgross35 force-pushed the musl-bump branch from b358cd6 to 30133e9 Compare June 29, 2026 18:58

Merged via the queue into rust-lang:main with commit b319ce3 Jun 29, 2026
56 checks passed

rustbot removed the S-waiting-on-review label Jun 29, 2026

rustbot mentioned this pull request Jun 29, 2026

linux: add seccomp user notification ioctl constants #5224

Merged

3 tasks

tgross35 deleted the musl-bump branch June 29, 2026 19:41

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

linux: Update the value of SW_MAX and SW_CNT

79487e6

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6-…

528de20

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

linux: Update the value of SW_MAX and SW_CNT

f0fe8bf

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6-…

6d14ca4

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

This was referenced Jul 20, 2026

[0.2] Backports #5293

Merged

[0.2] Backports #5294

Merged

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

linux: Update the value of SW_MAX and SW_CNT

f1fcbed

Source: torvalds/linux@67890d5 (backport <rust-lang#5215>) (cherry picked from commit 348414e)

tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jul 20, 2026

ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6-…

76426d9

…>7.0) (backport <rust-lang#5215>) (cherry picked from commit b319ce3)

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jul 21, 2026

tgross35 mentioned this pull request Jul 21, 2026

ci: Switch to ubuntu:26.04 images #5175

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6->7.0)#5215

ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6->7.0)#5215
tgross35 merged 7 commits into
rust-lang:mainfrom
tgross35:musl-bump

tgross35 commented Jun 24, 2026

Uh oh!

tgross35 commented Jun 24, 2026

Uh oh!

tgross35 commented Jun 25, 2026

Uh oh!

rustbot commented Jun 25, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jun 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

tgross35 commented Jun 24, 2026

Uh oh!

tgross35 commented Jun 24, 2026

Uh oh!

tgross35 commented Jun 25, 2026

Uh oh!

rustbot commented Jun 25, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jun 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants