add glibc 2.35, 2.36, 2.37, and 2.38 by andrewrk · Pull Request #17489 · ziglang/zig

andrewrk · 2023-10-12T03:44:15Z

Merge Checklist

Update the headers to 2.38.
Inspect git log -- lib/libc/glibc lib/libc/include and look for glibc patches and reapply them.
Test cross compiling hello.c against every version of glibc x every architecture
Test the std lib tests for every architecture against 2.38 using qemu

Closes #12808
Closes #12809
Closes #14798
Closes #16668

andrewrk · 2023-10-13T04:12:58Z

As part of this process I have uploaded 3 tarballs of glibc compiled for all targets:

motiejus · 2023-10-13T07:19:01Z

cc @linzhp / @sywhang you may be interested in checking this out soon after landing (or now).

generated from the latest commits of ziglang/glibc-abi-tool which contains glibc 2.35, 2.36, 2.37, and 2.38.

I went ahead and left the README.md file deleted because it had broken git hashes. Better to use `git log -- lib/libc/glibc/` to find out the patches.

so let's not include those headers until more investigation happens.

Instead Zig passes it based on the target.

This is a patch to glibc features.h which makes _DYNAMIC_STACK_SIZE_SOURCE undefined unless the version is >= 2.34. This feature was introduced with glibc 2.34 and without this patch, code built against these headers but then run on an older glibc will end up making a call to sysconf() that returns -1 for the value of SIGSTKSZ and MINSIGSTKSZ.

- `fcntl` was renamed to `fcntl64` in glibc 2.28 (see #9485) - `res_{,n}{search,query,querydomain}` became "their own" symbols since glibc 2.34: they were prefixed with `__` before. This PR makes it possible to use `fcntl` with glibc 2.27 or older and the `res_*` functions with glibc 2.33 or older. These patches will become redundant with universal-headers and can be dropped. But we have to do with what we have now.

This is necessary to build glib.

I could have just included the file from upstream glibc, but it was too silly so I just inlined it. This patch could be dropped in a future glibc update if desired. If omitted it will cause easily solvable C compilation failures building glibc nonshared.

instead of importing every header file under the sun, I copied a couple inline functions into these files to make them work.

I don't know where glibc thinks uintptr_t is coming from, but here it is.

This is the only place in all of glibc that this macro is referenced. What is it doing? Only preventing fstatat.c from knowing the type definition of `__time64_t`, apparently. Fixes compilation of fstatat.c on 32-bit x86.

These are tripping on 32-bit x86 but are intended to prevent glibc itself from being built with a bad configuration. Zig is only using this file to create libc_nonshared.a, so it's not relevant.

andrewrk · 2023-10-14T02:40:32Z

All these checks pass:

stage4/bin/zig build-exe hello.c -lc -target      x86_64-linux-gnu.2.38
stage4/bin/zig build-exe hello.c -lc -target     aarch64-linux-gnu.2.38
stage4/bin/zig build-exe hello.c -lc -target         x86-linux-gnu.2.38
stage4/bin/zig build-exe hello.c -lc -target powerpc64le-linux-gnu.2.38

stage4/bin/zig build-exe hello.c -lc -target      x86_64-linux-gnu.2.37
stage4/bin/zig build-exe hello.c -lc -target     aarch64-linux-gnu.2.37
stage4/bin/zig build-exe hello.c -lc -target         x86-linux-gnu.2.37
stage4/bin/zig build-exe hello.c -lc -target powerpc64le-linux-gnu.2.37

stage4/bin/zig build-exe hello.c -lc -target      x86_64-linux-gnu.2.36
stage4/bin/zig build-exe hello.c -lc -target     aarch64-linux-gnu.2.36
stage4/bin/zig build-exe hello.c -lc -target         x86-linux-gnu.2.36
stage4/bin/zig build-exe hello.c -lc -target powerpc64le-linux-gnu.2.36

stage4/bin/zig build-exe hello.c -lc -target      x86_64-linux-gnu.2.35
stage4/bin/zig build-exe hello.c -lc -target     aarch64-linux-gnu.2.35
stage4/bin/zig build-exe hello.c -lc -target         x86-linux-gnu.2.35
stage4/bin/zig build-exe hello.c -lc -target powerpc64le-linux-gnu.2.35

stage4/bin/zig build-exe hello.c -lc -target      x86_64-linux-gnu.2.34
stage4/bin/zig build-exe hello.c -lc -target     aarch64-linux-gnu.2.34
stage4/bin/zig build-exe hello.c -lc -target         x86-linux-gnu.2.34
stage4/bin/zig build-exe hello.c -lc -target powerpc64le-linux-gnu.2.34

These architectures correspond to the test matrix in test/tests.zig.

Next I will run the behavior tests and std lib tests against the full test matrix for glibc 2.38.

andrewrk force-pushed the glibc-update branch from 69be412 to b33e65f Compare October 13, 2023 04:32

andrewrk and others added 15 commits October 13, 2023 17:44

glibc: update abilists file

f458c13

generated from the latest commits of ziglang/glibc-abi-tool which contains glibc 2.35, 2.36, 2.37, and 2.38.

tools/update_glibc: exempt some more files

87b3e23

update glibc start files to 2.38

2314051

I went ahead and left the README.md file deleted because it had broken git hashes. Better to use `git log -- lib/libc/glibc/` to find out the patches.

glibc: update libc-modules.h to 2.38

4a30028

it's unclear which zig target glibc sparcv9 maps to

0813539

so let's not include those headers until more investigation happens.

update glibc headers to 2.38

8d3892b

glibc patch: don't hardcode __GLIBC_MINOR__

4bfa18b

Instead Zig passes it based on the target.

glibc patch: add a few dn_* functions

b7e5a31

This is necessary to build glib.

glibc patch: make fstatat.c and fstatat64.c compile

50e1834

instead of importing every header file under the sun, I copied a couple inline functions into these files to make them work.

glibc patch: add missing includes for inttypes.h

6d8b7e9

I don't know where glibc thinks uintptr_t is coming from, but here it is.

glibc patch: don't check __LIBC macro

0b16500

This is the only place in all of glibc that this macro is referenced. What is it doing? Only preventing fstatat.c from knowing the type definition of `__time64_t`, apparently. Fixes compilation of fstatat.c on 32-bit x86.

glibc patch: remove some static asserts from fstatat

701ef1f

These are tripping on 32-bit x86 but are intended to prevent glibc itself from being built with a bad configuration. Zig is only using this file to create libc_nonshared.a, so it's not relevant.

andrewrk force-pushed the glibc-update branch from b33e65f to 701ef1f Compare October 14, 2023 02:39

andrewrk marked this pull request as ready for review October 14, 2023 02:47

andrewrk merged commit 1a6ba7e into master Oct 14, 2023

andrewrk deleted the glibc-update branch October 14, 2023 07:34

andrewrk mentioned this pull request Oct 14, 2023

glibc.zig: update libc_nonshared to match upstream #17521

Closed

squeek502 mentioned this pull request Oct 15, 2023

Synchronize what gets compiled into libc_nonshared.a with glibc #16970

Closed

rootbeer mentioned this pull request Dec 20, 2023

zigcc: undefined symbol: __isoc23_* when combining Janet and Raylib libraries #18330

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

add glibc 2.35, 2.36, 2.37, and 2.38#17489

add glibc 2.35, 2.36, 2.37, and 2.38#17489
andrewrk merged 15 commits intomasterfrom
glibc-update

andrewrk commented Oct 12, 2023 •

edited

Loading

Uh oh!

andrewrk commented Oct 13, 2023

Uh oh!

motiejus commented Oct 13, 2023

Uh oh!

andrewrk commented Oct 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

andrewrk commented Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Checklist

Uh oh!

andrewrk commented Oct 13, 2023

Uh oh!

motiejus commented Oct 13, 2023

Uh oh!

andrewrk commented Oct 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

andrewrk commented Oct 12, 2023 •

edited

Loading