Commit 45836678d76014f94d35a2ffea983c21a57426c4 | zig

lib/libc/glibc/README.md created+83

...	@@ -0,0 +1,83 @@
1	# Zig GNU C Library ("glibc") Support
2
3	Zig supports building binaries that will dynamically link against the
4	[GNU C Library ("glibc")](https://www.gnu.org/software/libc/) when run.
5	This support extends across a range of glibc versions.
6
7	By default, Zig binaries will not depend on any external C library, but
8	they can be linked against one with the `-lc` option. The target ABI defines
9	which C library: `musl` for the [musl C library](https://musl.libc.org/) or
10	`gnu` for the GNU C library.
11
12	A specific GNU C library version can be chosen with an appropriate
13	`-target`. For example, `-target native-native-gnu.2.19` will use the
14	default CPU and OS targets, but will link in a run-time dependency on
15	glibc v2.19 (or later). Use `zig env` to show the default target and
16	version.
17
18	Glibc symbols are defined in the `std.c.` namespace in Zig, though the
19	`std.os.` namespace is generally what should be used to access C-library
20	APIs in Zig code (it is defined depending on the linked C library).
21
22	See `src/glibc.zig` for how Zig will build the glibc components. The
23	generated shared object files are sufficient only for compile-time
24	linking. They are stub libraries that only indicate that which symbols
25	will be present at run-time, along with their type and size. The symbols
26	do not reference an actual implementation.
27
28	## Targets
29
30	The GNU C Library supports a very wide set of platforms and architectures.
31	The current Zig support for glibc only includes Linux.
32
33	Zig supports glibc versions back to v2.17 (2012) as the Zig standard
34	library depends on symbols that were introduced in 2.17.
35
36	## Glibc stubs
37
38	The file `lib/libc/glibc/abilist` is a Zig-specific binary blob that
39	defines the supported glibc versions and the set of symbols each version
40	must define. See https://github.com/ziglang/glibc-abi-tool for the
41	tooling to generate this blob. The code in `glibc.zig` parses the abilist
42	to build version-specific stub libraries on demand.
43
44	The generated stub library is used for compile-time linking, with the
45	expectation that at run-time the real glibc library will provide the
46	actual symbol implementations.
47
48	### Public Headers
49
50	The glibc headers are in `lib/libc/include/generic-glibc/`. These are
51	customized and have a couple Zig-specific `#ifdef`s to make the single set
52	of headers represent any of the supported glibc versions. There are
53	currently a handful of patches to these headers to represent new features
54	(e.g. `reallocarray`) or changes in implementation (e.g., the `stat()`
55	family of functions).
56
57	The related Zig https://github.com/ziglang/universal-headers is a project
58	designed to more robustly build multi-version header files suitable for
59	compilation across a variety of target C library versions.
60
61	## Glibc static C-Runtime object files and libraries
62
63	Linking against glibc also implies linking against several, generally
64	"invisible" glibc C Runtime libraries: `crti.o`, `crtn.o`, `Scrt1.o` and
65	`libc_nonshared.a`. These objects are linked into generated Zig binaries
66	and are not run-time linking dependencies. Generally they provide
67	bootstrapping, initialization, and mapping of un-versioned public APIs to
68	glibc-private versioned APIs.
69
70	Like the public headers, these files contain a couple customiziations for
71	Zig to be able to build for any supported glibc version. E.g., for glibc
72	versions before v2.32, `libc_nonshared.a` contained stubs that directed
73	the `fstat()` call to a versioned `__fxstat()` call.
74
75	These files used for these objects are in `lib/libc/glibc`. See the
76	`tools/update_glibc.zig` tool for updating content in here from the
77	upstream glibc.
78
79	# More Information
80
81	See
82	https://github.com/ziglang/zig/commit/2314051acaad37dd5630dd7eca08571d620d6496
83	for an example commit that updates glibc (to v2.38).

lib/libc/glibc/include/libc-symbols.h+12

...	@@ -155,6 +155,18 @@	...	@@ -155,6 +155,18 @@
155	extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))) \	155	extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))) \
156	__attribute_copy__ (name);	156	__attribute_copy__ (name);
157		157
		158	/* Zig patch. weak_hidden_alias was removed from glibc v2.36 (v2.37?), Zig
		159	needs it for the v2.32 and earlier {f,l,}stat wrappers, so only include
		160	in this header for 2.32 and earlier. */
		161	#if (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 32) \|\| __GLIBC__ < 2
		162	# define weak_hidden_alias(name, aliasname) \
		163	_weak_hidden_alias (name, aliasname)
		164	# define _weak_hidden_alias(name, aliasname) \
		165	extern __typeof (name) aliasname \
		166	__attribute__ ((weak, alias (#name), __visibility__ ("hidden"))) \
		167	__attribute_copy__ (name);
		168	#endif
		169
158	/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */	170	/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */
159	# define weak_extern(symbol) _weak_extern (weak symbol)	171	# define weak_extern(symbol) _weak_extern (weak symbol)
160	# define _weak_extern(expr) _Pragma (#expr)	172	# define _weak_extern(expr) _Pragma (#expr)

lib/libc/glibc/io/fstat-2.32.c created+55

...	@@ -0,0 +1,55 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef fstat
47	#undef __fstat
48	int
49	attribute_hidden
50	__fstat (int fd, struct stat *buf)
51	{
52	return __fxstat (_STAT_VER, fd, buf);
53	}
54
55	weak_hidden_alias (__fstat, fstat)

lib/libc/glibc/io/fstat64-2.32.c created+52

...	@@ -0,0 +1,52 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef fstat64
47	int
48	attribute_hidden
49	fstat64 (int fd, struct stat64 *buf)
50	{
51	return __fxstat64 (_STAT_VER, fd, buf);
52	}

lib/libc/glibc/io/fstatat-2.32.c created+52

...	@@ -0,0 +1,52 @@
1	/* Copyright (C) 2005-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef fstatat
47	int
48	attribute_hidden
49	fstatat (int fd, const char file, struct stat buf, int flag)
50	{
51	return __fxstatat (_STAT_VER, fd, file, buf, flag);
52	}

lib/libc/glibc/io/fstatat64-2.32.c created+52

...	@@ -0,0 +1,52 @@
1	/* Copyright (C) 2005-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef fstatat64
47	int
48	attribute_hidden
49	fstatat64 (int fd, const char file, struct stat64 buf, int flag)
50	{
51	return __fxstatat64 (_STAT_VER, fd, file, buf, flag);
52	}

lib/libc/glibc/io/lstat-2.32.c created+55

...	@@ -0,0 +1,55 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef lstat
47	#undef __lstat
48	int
49	attribute_hidden
50	__lstat (const char file, struct stat buf)
51	{
52	return __lxstat (_STAT_VER, file, buf);
53	}
54
55	weak_hidden_alias (__lstat, lstat)

lib/libc/glibc/io/lstat64-2.32.c created+52

...	@@ -0,0 +1,52 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef lstat64
47	int
48	attribute_hidden
49	lstat64 (const char file, struct stat64 buf)
50	{
51	return __lxstat64 (_STAT_VER, file, buf);
52	}

lib/libc/glibc/io/mknod-2.32.c created+55

...	@@ -0,0 +1,55 @@
1	/* Copyright (C) 1995-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35
36	#include <sys/types.h>
37	#include <sys/stat.h>
38
39	/* This definition is only used if inlining fails for this function; see
40	the last page of <sys/stat.h>. The real work is done by the `x'
41	function which is passed a version number argument. We arrange in the
42	makefile that when not inlined this function is always statically
43	linked; that way a dynamically-linked executable always encodes the
44	version number corresponding to the data structures it uses, so the `x'
45	functions in the shared library can adapt without needing to recompile
46	all callers. */
47
48	int
49	attribute_hidden
50	__mknod (const char *path, mode_t mode, dev_t dev)
51	{
52	return __xmknod (_MKNOD_VER, path, mode, &dev);
53	}
54
55	weak_hidden_alias (__mknod, mknod)

lib/libc/glibc/io/mknodat-2.32.c created+53

...	@@ -0,0 +1,53 @@
1	/* Copyright (C) 1995-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35
36	#include <sys/types.h>
37	#include <sys/stat.h>
38
39	/* This definition is only used if inlining fails for this function; see
40	the last page of <sys/stat.h>. The real work is done by the `x'
41	function which is passed a version number argument. We arrange in the
42	makefile that when not inlined this function is always statically
43	linked; that way a dynamically-linked executable always encodes the
44	version number corresponding to the data structures it uses, so the `x'
45	functions in the shared library can adapt without needing to recompile
46	all callers. */
47
48	int
49	attribute_hidden
50	mknodat (int fd, const char *path, mode_t mode, dev_t dev)
51	{
52	return __xmknodat (_MKNOD_VER, fd, path, mode, &dev);
53	}

lib/libc/glibc/io/stat-2.32.c created+54

...	@@ -0,0 +1,54 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef stat
47	int
48	attribute_hidden
49	__stat (const char file, struct stat buf)
50	{
51	return __xstat (_STAT_VER, file, buf);
52	}
53
54	weak_hidden_alias (__stat, stat)

lib/libc/glibc/io/stat64-2.32.c created+52

...	@@ -0,0 +1,52 @@
1	/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
2	This file is part of the GNU C Library.
3
4	The GNU C Library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Lesser General Public
6	License as published by the Free Software Foundation; either
7	version 2.1 of the License, or (at your option) any later version.
8
9	In addition to the permissions in the GNU Lesser General Public
10	License, the Free Software Foundation gives you unlimited
11	permission to link the compiled version of this file with other
12	programs, and to distribute those programs without any restriction
13	coming from the use of this file. (The GNU Lesser General Public
14	License restrictions do apply in other respects; for example, they
15	cover modification of the file, and distribution when not linked
16	into another program.)
17
18	Note that people who make modified versions of this file are not
19	obligated to grant this special exception for their modified
20	versions; it is their choice whether to do so. The GNU Lesser
21	General Public License gives permission to release a modified
22	version without this exception; this exception also makes it
23	possible to release a modified version which carries forward this
24	exception.
25
26	The GNU C Library is distributed in the hope that it will be useful,
27	but WITHOUT ANY WARRANTY; without even the implied warranty of
28	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	Lesser General Public License for more details.
30
31	You should have received a copy of the GNU Lesser General Public
32	License along with the GNU C Library; if not, see
33	<https://www.gnu.org/licenses/>. */
34
35	#include <sys/stat.h>
36
37	/* This definition is only used if inlining fails for this function; see
38	the last page of <sys/stat.h>. The real work is done by the `x'
39	function which is passed a version number argument. We arrange in the
40	makefile that when not inlined this function is always statically
41	linked; that way a dynamically-linked executable always encodes the
42	version number corresponding to the data structures it uses, so the `x'
43	functions in the shared library can adapt without needing to recompile
44	all callers. */
45
46	#undef stat64
47	int
48	attribute_hidden
49	stat64 (const char file, struct stat64 buf)
50	{
51	return __xstat64 (_STAT_VER, file, buf);
52	}

lib/libc/glibc/sysdeps/unix/sysv/linux/alpha/kernel_stat.h deleted-91

...	@@ -1,91 +0,0 @@
1	/* Definition of `struct stat' used in the kernel. */
2	struct kernel_stat
3	{
4	unsigned int st_dev;
5	unsigned int st_ino;
6	unsigned int st_mode;
7	unsigned int st_nlink;
8	unsigned int st_uid;
9	unsigned int st_gid;
10	unsigned int st_rdev;
11	long int st_size;
12	unsigned long int st_atime_sec;
13	unsigned long int st_mtime_sec;
14	unsigned long int st_ctime_sec;
15	unsigned int st_blksize;
16	int st_blocks;
17	unsigned int st_flags;
18	unsigned int st_gen;
19	};
20
21	/* Definition of `struct stat64' used in the kernel. */
22	struct kernel_stat64
23	{
24	unsigned long st_dev;
25	unsigned long st_ino;
26	unsigned long st_rdev;
27	long st_size;
28	unsigned long st_blocks;
29
30	unsigned int st_mode;
31	unsigned int st_uid;
32	unsigned int st_gid;
33	unsigned int st_blksize;
34	unsigned int st_nlink;
35	unsigned int __pad0;
36
37	unsigned long st_atime_sec;
38	unsigned long st_atimensec;
39	unsigned long st_mtime_sec;
40	unsigned long st_mtimensec;
41	unsigned long st_ctime_sec;
42	unsigned long st_ctimensec;
43	long __glibc_reserved[3];
44	};
45
46	/* Definition of `struct stat' used by glibc 2.0. */
47	struct glibc2_stat
48	{
49	__dev_t st_dev;
50	__ino_t st_ino;
51	__mode_t st_mode;
52	__nlink_t st_nlink;
53	__uid_t st_uid;
54	__gid_t st_gid;
55	__dev_t st_rdev;
56	__off_t st_size;
57	__time_t st_atime_sec;
58	__time_t st_mtime_sec;
59	__time_t st_ctime_sec;
60	unsigned int st_blksize;
61	int st_blocks;
62	unsigned int st_flags;
63	unsigned int st_gen;
64	};
65
66	/* Definition of `struct stat' used by glibc 2.1. */
67	struct glibc21_stat
68	{
69	__dev_t st_dev;
70	__ino64_t st_ino;
71	__mode_t st_mode;
72	__nlink_t st_nlink;
73	__uid_t st_uid;
74	__gid_t st_gid;
75	__dev_t st_rdev;
76	__off_t st_size;
77	__time_t st_atime_sec;
78	__time_t st_mtime_sec;
79	__time_t st_ctime_sec;
80	__blkcnt64_t st_blocks;
81	__blksize_t st_blksize;
82	unsigned int st_flags;
83	unsigned int st_gen;
84	int __pad3;
85	long __glibc_reserved[4];
86	};
87
88	#define STAT_IS_KERNEL_STAT 0
89	#define STAT64_IS_KERNEL_STAT64 1
90	#define XSTAT_IS_XSTAT64 1
91	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/arm/kernel_stat.h deleted-40

...	@@ -1,40 +0,0 @@
1	/* Definition of `struct stat' used in the kernel.. */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned short int __pad1;
6	#define _HAVE___PAD1
7	unsigned long int st_ino;
8	unsigned short int st_mode;
9	unsigned short int st_nlink;
10	unsigned short int st_uid;
11	unsigned short int st_gid;
12	unsigned short int st_rdev;
13	unsigned short int __pad2;
14	#define _HAVE___PAD2
15	unsigned long int st_size;
16	unsigned long int st_blksize;
17	unsigned long int st_blocks;
18	struct timespec st_atim;
19	struct timespec st_mtim;
20	struct timespec st_ctim;
21	unsigned long int __glibc_reserved4;
22	#define _HAVE___UNUSED4
23	unsigned long int __glibc_reserved5;
24	#define _HAVE___UNUSED5
25	};
26
27	#define _HAVE_STAT___UNUSED4
28	#define _HAVE_STAT___UNUSED5
29	#define _HAVE_STAT___PAD1
30	#define _HAVE_STAT___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64___PAD1
33	#define _HAVE_STAT64___PAD2
34	#define _HAVE_STAT64___ST_INO
35	#define _HAVE_STAT64_NSEC
36
37	#define STAT_IS_KERNEL_STAT 0
38	#define STAT64_IS_KERNEL_STAT64 1
39	#define XSTAT_IS_XSTAT64 0
40	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/hppa/kernel_stat.h deleted-36

...	@@ -1,36 +0,0 @@
1	/* definition of "struct stat" from the kernel */
2	struct kernel_stat {
3	unsigned long st_dev; /* dev_t is 32 bits on parisc */
4	unsigned long st_ino; /* 32 bits */
5	unsigned short st_mode; /* 16 bits */
6	unsigned short st_nlink; /* 16 bits */
7	unsigned short st_reserved1; /* old st_uid */
8	unsigned short st_reserved2; /* old st_gid */
9	unsigned long st_rdev;
10	unsigned long st_size;
11	struct timespec st_atim;
12	struct timespec st_mtim;
13	struct timespec st_ctim;
14	long st_blksize;
15	long st_blocks;
16	unsigned long __glibc_reserved1; /* ACL stuff */
17	unsigned long __glibc_reserved2; /* network */
18	unsigned long __glibc_reserved3; /* network */
19	unsigned long __glibc_reserved4; /* cnodes */
20	unsigned short __glibc_reserved5; /* netsite */
21	short st_fstype;
22	unsigned long st_realdev;
23	unsigned short st_basemode;
24	unsigned short st_spareshort;
25	unsigned long st_uid;
26	unsigned long st_gid;
27	unsigned long st_spare4[3];
28	};
29
30	#define _HAVE_STAT_NSEC
31	#define _HAVE_STAT64_NSEC
32
33	#define STAT_IS_KERNEL_STAT 0
34	#define STAT64_IS_KERNEL_STAT64 1
35	#define XSTAT_IS_XSTAT64 0
36	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/i386/kernel_stat.h deleted-40

...	@@ -1,40 +0,0 @@
1	/* Definition of `struct stat' used in the kernel.. */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned short int __pad1;
6	#define _HAVE___PAD1
7	unsigned long int st_ino;
8	unsigned short int st_mode;
9	unsigned short int st_nlink;
10	unsigned short int st_uid;
11	unsigned short int st_gid;
12	unsigned short int st_rdev;
13	unsigned short int __pad2;
14	#define _HAVE___PAD2
15	unsigned long int st_size;
16	unsigned long int st_blksize;
17	unsigned long int st_blocks;
18	struct timespec st_atim;
19	struct timespec st_mtim;
20	struct timespec st_ctim;
21	unsigned long int __glibc_reserved4;
22	#define _HAVE___UNUSED4
23	unsigned long int __glibc_reserved5;
24	#define _HAVE___UNUSED5
25	};
26
27	#define _HAVE_STAT___UNUSED4
28	#define _HAVE_STAT___UNUSED5
29	#define _HAVE_STAT___PAD1
30	#define _HAVE_STAT___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64___PAD1
33	#define _HAVE_STAT64___PAD2
34	#define _HAVE_STAT64___ST_INO
35	#define _HAVE_STAT64_NSEC
36
37	#define STAT_IS_KERNEL_STAT 0
38	#define STAT64_IS_KERNEL_STAT64 1
39	#define XSTAT_IS_XSTAT64 0
40	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/kstat_cp.h deleted-2

...	@@ -1,2 +0,0 @@
1	/* Empty, it is overridden by an architecture which might require copy to or
2	from a kernel_stat stat struct to glibc export stat{64}. */

lib/libc/glibc/sysdeps/unix/sysv/linux/m68k/kernel_stat.h deleted-40

...	@@ -1,40 +0,0 @@
1	/* Definition of `struct stat' used in the kernel.. */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned short int __pad1;
6	#define _HAVE___PAD1
7	unsigned long int st_ino;
8	unsigned short int st_mode;
9	unsigned short int st_nlink;
10	unsigned short int st_uid;
11	unsigned short int st_gid;
12	unsigned short int st_rdev;
13	unsigned short int __pad2;
14	#define _HAVE___PAD2
15	unsigned long int st_size;
16	unsigned long int st_blksize;
17	unsigned long int st_blocks;
18	struct timespec st_atim;
19	struct timespec st_mtim;
20	struct timespec st_ctim;
21	unsigned long int __glibc_reserved4;
22	#define _HAVE___UNUSED4
23	unsigned long int __glibc_reserved5;
24	#define _HAVE___UNUSED5
25	};
26
27	#define _HAVE_STAT___UNUSED4
28	#define _HAVE_STAT___UNUSED5
29	#define _HAVE_STAT___PAD1
30	#define _HAVE_STAT___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64___PAD1
33	#define _HAVE_STAT64___PAD2
34	#define _HAVE_STAT64___ST_INO
35	#define _HAVE_STAT64_NSEC
36
37	#define STAT_IS_KERNEL_STAT 0
38	#define STAT64_IS_KERNEL_STAT64 1
39	#define XSTAT_IS_XSTAT64 0
40	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/mips/kernel_stat.h deleted-75

...	@@ -1,75 +0,0 @@
1	#ifndef _KERNEL_STAT_H
2	#define _KERNEL_STAT_H
3
4	#include <sgidefs.h>
5	/* As tempting as it is to define XSTAT_IS_XSTAT64 for n64, the
6	userland data structures are not identical, because of different
7	padding. */
8	/* Definition of `struct stat' used in the kernel. */
9	#if _MIPS_SIM != _ABIO32
10	struct kernel_stat
11	{
12	unsigned int st_dev;
13	unsigned int __pad1[3];
14	unsigned long long st_ino;
15	unsigned int st_mode;
16	unsigned int st_nlink;
17	int st_uid;
18	int st_gid;
19	unsigned int st_rdev;
20	unsigned int __pad2[3];
21	long long st_size;
22	unsigned int st_atime_sec;
23	unsigned int st_atime_nsec;
24	unsigned int st_mtime_sec;
25	unsigned int st_mtime_nsec;
26	unsigned int st_ctime_sec;
27	unsigned int st_ctime_nsec;
28	unsigned int st_blksize;
29	unsigned int __pad3;
30	unsigned long long st_blocks;
31	};
32	#else
33	struct kernel_stat
34	{
35	unsigned long int st_dev;
36	long int __pad1[3]; /* Reserved for network id */
37	unsigned long int st_ino;
38	unsigned long int st_mode;
39	unsigned long int st_nlink;
40	long int st_uid;
41	long int st_gid;
42	unsigned long int st_rdev;
43	long int __pad2[2];
44	long int st_size;
45	long int __pad3;
46	unsigned int st_atime_sec;
47	unsigned int st_atime_nsec;
48	unsigned int st_mtime_sec;
49	unsigned int st_mtime_nsec;
50	unsigned int st_ctime_sec;
51	unsigned int st_ctime_nsec;
52	long int st_blksize;
53	long int st_blocks;
54	char st_fstype[16]; /* Filesystem type name, unsupported */
55	long st_pad4[8];
56	/* Linux specific fields */
57	unsigned int st_flags;
58	unsigned int st_gen;
59	};
60	#endif
61
62	#define STAT_IS_KERNEL_STAT 0
63	#define STAT64_IS_KERNEL_STAT64 0
64	#define XSTAT_IS_XSTAT64 0
65	#if _MIPS_SIM == _ABI64
66	# define STATFS_IS_STATFS64 1
67	#else
68	# define STATFS_IS_STATFS64 0
69	#endif
70	/* MIPS64 has unsigned 32 bit timestamps fields, so use statx as well. */
71	#if _MIPS_SIM == _ABI64
72	# define STAT_HAS_TIME32
73	#endif
74
75	#endif

lib/libc/glibc/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h deleted-40

...	@@ -1,40 +0,0 @@
1	/* Definition of `struct stat' used in the kernel.. */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned short int __pad1;
6	#define _HAVE___PAD1
7	unsigned long int st_ino;
8	unsigned short int st_mode;
9	unsigned short int st_nlink;
10	unsigned short int st_uid;
11	unsigned short int st_gid;
12	unsigned short int st_rdev;
13	unsigned short int __pad2;
14	#define _HAVE___PAD2
15	unsigned long int st_size;
16	unsigned long int st_blksize;
17	unsigned long int st_blocks;
18	struct timespec st_atim;
19	struct timespec st_mtim;
20	struct timespec st_ctim;
21	unsigned long int __glibc_reserved4;
22	#define _HAVE___UNUSED4
23	unsigned long int __glibc_reserved5;
24	#define _HAVE___UNUSED5
25	};
26
27	#define _HAVE_STAT___UNUSED4
28	#define _HAVE_STAT___UNUSED5
29	#define _HAVE_STAT___PAD1
30	#define _HAVE_STAT___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64___PAD1
33	#define _HAVE_STAT64___PAD2
34	#define _HAVE_STAT64___ST_INO
35	#define _HAVE_STAT64_NSEC
36
37	#define STAT_IS_KERNEL_STAT 0
38	#define STAT64_IS_KERNEL_STAT64 1
39	#define XSTAT_IS_XSTAT64 0
40	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/sh/kernel_stat.h deleted-40

...	@@ -1,40 +0,0 @@
1	/* Definition of `struct stat' used in the kernel.. */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned short int __pad1;
6	#define _HAVE___PAD1
7	unsigned long int st_ino;
8	unsigned short int st_mode;
9	unsigned short int st_nlink;
10	unsigned short int st_uid;
11	unsigned short int st_gid;
12	unsigned short int st_rdev;
13	unsigned short int __pad2;
14	#define _HAVE___PAD2
15	unsigned long int st_size;
16	unsigned long int st_blksize;
17	unsigned long int st_blocks;
18	struct timespec st_atim;
19	struct timespec st_mtim;
20	struct timespec st_ctim;
21	unsigned long int __glibc_reserved4;
22	#define _HAVE___UNUSED4
23	unsigned long int __glibc_reserved5;
24	#define _HAVE___UNUSED5
25	};
26
27	#define _HAVE_STAT___UNUSED4
28	#define _HAVE_STAT___UNUSED5
29	#define _HAVE_STAT___PAD1
30	#define _HAVE_STAT___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64___PAD1
33	#define _HAVE_STAT64___PAD2
34	#define _HAVE_STAT64___ST_INO
35	#define _HAVE_STAT64_NSEC
36
37	#define STAT_IS_KERNEL_STAT 0
38	#define STAT64_IS_KERNEL_STAT64 1
39	#define XSTAT_IS_XSTAT64 0
40	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h deleted-37

...	@@ -1,37 +0,0 @@
1	/* Definition of `struct stat' used in the kernel */
2	struct kernel_stat
3	{
4	unsigned short int st_dev;
5	unsigned long int st_ino;
6	unsigned short int st_mode;
7	short int st_nlink;
8	unsigned short int st_uid;
9	unsigned short int st_gid;
10	unsigned short int st_rdev;
11	long int st_size;
12	struct timespec st_atim;
13	struct timespec st_mtim;
14	struct timespec st_ctim;
15	long int st_blksize;
16	long int st_blocks;
17	unsigned long int __glibc_reserved4;
18	unsigned long int __glibc_reserved5;
19	};
20
21	#define _HAVE___UNUSED4
22	#define _HAVE___UNUSED5
23
24	#define _HAVE_STAT___UNUSED4
25	#define _HAVE_STAT___UNUSED5
26	#define _HAVE_STAT___PAD1
27	#define _HAVE_STAT___PAD2
28	#define _HAVE_STAT64___UNUSED4
29	#define _HAVE_STAT64___UNUSED5
30	#define _HAVE_STAT64___PAD2
31	#define _HAVE_STAT_NSEC
32	#define _HAVE_STAT64_NSEC
33
34	#define STAT_IS_KERNEL_STAT 0
35	#define STAT64_IS_KERNEL_STAT64 1
36	#define XSTAT_IS_XSTAT64 0
37	#define STATFS_IS_STATFS64 0

lib/libc/glibc/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h deleted-58

...	@@ -1,58 +0,0 @@
1	#ifndef _KERNEL_STAT_H
2	#define _KERNEL_STAT_H
3
4	/* Definition of `struct stat' used in the kernel */
5	struct kernel_stat
6	{
7	unsigned int st_dev;
8	unsigned long int st_ino;
9	unsigned int st_mode;
10	short int st_nlink;
11	unsigned int st_uid;
12	unsigned int st_gid;
13	unsigned int st_rdev;
14	long int st_size;
15	long int st_atime_sec;
16	long int st_mtime_sec;
17	long int st_ctime_sec;
18	long int st_blksize;
19	long int st_blocks;
20	unsigned long int __glibc_reserved1;
21	unsigned long int __glibc_reserved2;
22	};
23
24	/* Definition of `struct stat64' used in the kernel. */
25	struct kernel_stat64
26	{
27	unsigned long int st_dev;
28	unsigned long int st_ino;
29	unsigned long int st_nlink;
30
31	unsigned int st_mode;
32	unsigned int st_uid;
33	unsigned int st_gid;
34	unsigned int __pad0;
35
36	unsigned long int st_rdev;
37	long int st_size;
38	long int st_blksize;
39	long int st_blocks;
40
41	unsigned long int st_atime_sec;
42	unsigned long int st_atime_nsec;
43	unsigned long int st_mtime_sec;
44	unsigned long int st_mtime_nsec;
45	unsigned long int st_ctime_sec;
46	unsigned long int st_ctime_nsec;
47	long int __glibc_reserved[3];
48	};
49
50	#define STAT_IS_KERNEL_STAT 0
51	#define STAT64_IS_KERNEL_STAT64 0
52	#define XSTAT_IS_XSTAT64 1
53	#ifdef __arch64__
54	# define STATFS_IS_STATFS64 1
55	#else
56	# define STATFS_IS_STATFS64 0
57	#endif
58	#endif /* _KERNEL_STAT_H */

lib/libc/include/generic-glibc/string.h+6

 @@ -501,6 +501,11 @@ extern char *stpncpy (char *__restrict __dest,
      __THROW __nonnull ((1, 2));
 #endif
+/*
+ * strlcpy and strlcat introduced in glibc 2.38
+ * https://sourceware.org/git/?p=glibc.git;a=commit;h=2e0bbbfbf95fc9e22692e93658a6fbdd2d4554da
+ */
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2
 #ifdef __USE_MISC
 /* Copy at most N - 1 characters from SRC to DEST.  */
 extern size_t strlcpy (char *__restrict __dest,
 @@ -513,6 +518,7 @@ extern size_t strlcat (char *__restrict __dest,
 		       const char *__restrict __src, size_t __n)
   __THROW __nonnull ((1, 2))  __attr_access ((__read_write__, 1, 3));
 #endif
+#endif /* glibc v2.38 and later */
 #ifdef	__USE_GNU
 /* Compare S1 and S2 as strings holding name & indices/version numbers.  */

lib/std/fs/test.zig-3

 @@ -660,9 +660,6 @@ test "readAllAlloc" {
 }
 test "Dir.statFile" {
-    // TODO: Re-enable once https://github.com/ziglang/zig/issues/17034 is solved
-    if (builtin.os.tag == .linux and builtin.link_libc and builtin.abi == .gnu) return error.SkipZigTest;
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
             const test_file_name = try ctx.transformPath("test_file");

src/glibc.zig+48-36

 @@ -20,7 +20,7 @@ pub const Lib = struct {
 };
 pub const ABI = struct {
-    all_versions: []const Version,
+    all_versions: []const Version, // all defined versions (one abilist from v2.0.0 up to current)
     all_targets: []const target_util.ArchOsAbi,
     /// The bytes from the file verbatim, starting from the u16 number
     /// of function inclusions.
 @@ -172,6 +172,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
     const target = comp.root_mod.resolved_target.result;
     const target_ver = target.os.version_range.linux.glibc;
+    const nonshared_stat = target_ver.order(.{ .major = 2, .minor = 32, .patch = 0 }) != .gt;
     const start_old_init_fini = target_ver.order(.{ .major = 2, .minor = 33, .patch = 0 }) != .gt;
     // In all cases in this function, we add the C compiler flags to
 @@ -276,54 +277,72 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
         },
         .libc_nonshared_a => {
             const s = path.sep_str;
-            const linux_prefix = lib_libc_glibc ++
-                "sysdeps" ++ s ++ "unix" ++ s ++ "sysv" ++ s ++ "linux" ++ s;
-            const Flavor = enum { nonshared, shared };
             const Dep = struct {
                 path: []const u8,
-                flavor: Flavor = .shared,
+                include: bool = true,
-                exclude: bool = false,
             };
             const deps = [_]Dep{
+                .{ .path = lib_libc_glibc ++ "stdlib" ++ s ++ "atexit.c" },
+                .{ .path = lib_libc_glibc ++ "stdlib" ++ s ++ "at_quick_exit.c" },
+                .{ .path = lib_libc_glibc ++ "sysdeps" ++ s ++ "pthread" ++ s ++ "pthread_atfork.c" },
+                .{ .path = lib_libc_glibc ++ "debug" ++ s ++ "stack_chk_fail_local.c" },
+                // libc_nonshared.a redirected stat functions to xstat until glibc 2.33,
+                // when they were finally versioned like other symbols.
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "stat-2.32.c",
+                    .include = nonshared_stat,
+                },
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "fstat-2.32.c",
+                    .include = nonshared_stat,
+                },
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "lstat-2.32.c",
+                    .include = nonshared_stat,
+                },
                 .{
-                    .path = lib_libc_glibc ++ "stdlib" ++ s ++ "atexit.c",
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "stat64-2.32.c",
-                    .flavor = .nonshared,
+                    .include = nonshared_stat,
                 },
                 .{
-                    .path = lib_libc_glibc ++ "stdlib" ++ s ++ "at_quick_exit.c",
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "fstat64-2.32.c",
-                    .flavor = .nonshared,
+                    .include = nonshared_stat,
                 },
                 .{
-                    .path = lib_libc_glibc ++ "sysdeps" ++ s ++ "pthread" ++ s ++ "pthread_atfork.c",
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "lstat64-2.32.c",
-                    .flavor = .nonshared,
+                    .include = nonshared_stat,
                 },
                 .{
-                    .path = lib_libc_glibc ++ "debug" ++ s ++ "stack_chk_fail_local.c",
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "fstatat-2.32.c",
-                    .flavor = .nonshared,
+                    .include = nonshared_stat,
                 },
-                .{ .path = lib_libc_glibc ++ "csu" ++ s ++ "errno.c" },
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "fstatat64-2.32.c",
+                    .include = nonshared_stat,
+                },
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "mknodat-2.32.c",
+                    .include = nonshared_stat,
+                },
+                .{
+                    .path = lib_libc_glibc ++ "io" ++ s ++ "mknod-2.32.c",
+                    .include = nonshared_stat,
+                },
+                // __libc_start_main used to require statically linked init/fini callbacks
+                // until glibc 2.34 when they were assimilated into the shared library.
                 .{
                     .path = lib_libc_glibc ++ "csu" ++ s ++ "elf-init-2.33.c",
-                    .exclude = !start_old_init_fini,
+                    .include = start_old_init_fini,
                 },
-                .{ .path = linux_prefix ++ "stat.c" },
-                .{ .path = linux_prefix ++ "fstat.c" },
-                .{ .path = linux_prefix ++ "lstat.c" },
-                .{ .path = linux_prefix ++ "stat64.c" },
-                .{ .path = linux_prefix ++ "fstat64.c" },
-                .{ .path = linux_prefix ++ "lstat64.c" },
-                .{ .path = linux_prefix ++ "fstatat.c" },
-                .{ .path = linux_prefix ++ "fstatat64.c" },
-                .{ .path = linux_prefix ++ "mknodat.c" },
-                .{ .path = lib_libc_glibc ++ "io" ++ s ++ "mknod.c" },
-                .{ .path = linux_prefix ++ "stat_t64_cp.c" },
             };
             var files_buf: [deps.len]Compilation.CSourceFile = undefined;
             var files_index: usize = 0;
             for (deps) |dep| {
-                if (dep.exclude) continue;
+                if (!dep.include) continue;
                 var args = std.ArrayList([]const u8).init(arena);
                 try args.appendSlice(&[_][]const u8{
 @@ -347,13 +366,6 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                     try args.append("-DCAN_USE_REGISTER_ASM_EBP");
                 }
-                const shared_def = switch (dep.flavor) {
-                    .nonshared => "-DLIBC_NONSHARED=1",
-                    // glibc passes `-DSHARED` for these. However, empirically if
-                    // we do that here we will see undefined symbols such as `__GI_memcpy`.
-                    // So we pass the same thing as for nonshared.
-                    .shared => "-DLIBC_NONSHARED=1",
-                };
                 try args.appendSlice(&[_][]const u8{
                     "-D_LIBC_REENTRANT",
                     "-include",
 @@ -363,7 +375,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                     "-include",
                     try lib_path(comp, arena, lib_libc_glibc ++ "include" ++ path.sep_str ++ "libc-symbols.h"),
                     "-DPIC",
-                    shared_def,
+                    "-DLIBC_NONSHARED=1",
                     "-DTOP_NAMESPACE=glibc",
                 });
                 files_buf[files_index] = .{

src/print_targets.zig+6-3

 @@ -79,9 +79,12 @@ pub fn cmdTargets(
     try jws.objectField("glibc");
     try jws.beginArray();
     for (glibc_abi.all_versions) |ver| {
-        const tmp = try std.fmt.allocPrint(allocator, "{}", .{ver});
+        // Actual glibc minimum is architecture specific. This just covers the broadest minimum.
-        defer allocator.free(tmp);
+        if (ver.order(target.glibc_min_version) != .lt) {
-        try jws.write(tmp);
+            const tmp = try std.fmt.allocPrint(allocator, "{}", .{ver});
+            defer allocator.free(tmp);
+            try jws.write(tmp);
+        }
     }
     try jws.endArray();

src/target.zig+18-3

 @@ -11,10 +11,16 @@ pub const ArchOsAbi = struct {
     os: std.Target.Os.Tag,
     abi: std.Target.Abi,
     os_ver: ?std.SemanticVersion = null,
+    // Minimum glibc version that provides support for the arch/os (for
+    // .abi = .gnu).  For most entries, the .glibc_min is null,
+    // meaning the Zig minimum required by the standard library (see
+    // glibc_min_version) is sufficient.
+    glibc_min: ?std.SemanticVersion = null,
 };
 pub const available_libcs = [_]ArchOsAbi{
-    .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu },
+    .{ .arch = .aarch64_be, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
     .{ .arch = .aarch64_be, .os = .linux, .abi = .musl },
     .{ .arch = .aarch64_be, .os = .windows, .abi = .gnu },
     .{ .arch = .aarch64, .os = .linux, .abi = .gnu },
 @@ -54,14 +60,14 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .mips, .os = .linux, .abi = .gnueabi },
     .{ .arch = .mips, .os = .linux, .abi = .gnueabihf },
     .{ .arch = .mips, .os = .linux, .abi = .musl },
-    .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu },
+    .{ .arch = .powerpc64le, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 19, .patch = 0 } },
     .{ .arch = .powerpc64le, .os = .linux, .abi = .musl },
     .{ .arch = .powerpc64, .os = .linux, .abi = .gnu },
     .{ .arch = .powerpc64, .os = .linux, .abi = .musl },
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },
     .{ .arch = .powerpc, .os = .linux, .abi = .musl },
-    .{ .arch = .riscv64, .os = .linux, .abi = .gnu },
+    .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 } },
     .{ .arch = .riscv64, .os = .linux, .abi = .musl },
     .{ .arch = .s390x, .os = .linux, .abi = .gnu },
     .{ .arch = .s390x, .os = .linux, .abi = .musl },
 @@ -76,6 +82,9 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } },
 };
+/// Minimum glibc version, due to dependencies from the Zig standard library on glibc symbols
+pub const glibc_min_version: std.SemanticVersion = .{ .major = 2, .minor = 17, .patch = 0 };
 pub fn libCGenericName(target: std.Target) [:0]const u8 {
     switch (target.os.tag) {
         .windows => return "mingw",
 @@ -154,6 +163,12 @@ pub fn canBuildLibC(target: std.Target) bool {
                 const ver = target.os.version_range.semver;
                 return ver.min.order(libc.os_ver.?) != .lt;
             }
+            // Ensure glibc (aka *-linux-gnu) version is supported
+            if (target.isGnuLibC()) {
+                const min_glibc_ver = libc.glibc_min orelse glibc_min_version;
+                const target_glibc_ver = target.os.version_range.linux.glibc;
+                return target_glibc_ver.order(min_glibc_ver) != .lt;
+            }
             return true;
         }
     }

test/link/glibc_compat/build.zig+101

...	@@ -1,4 +1,14 @@	...	@@ -1,4 +1,14 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const builtin = @import("builtin");
		3
		4	// To run executables linked against a specific glibc version, the
		5	// run-time glibc version needs to be new enough. Check the host's glibc
		6	// version. Note that this does not allow for translation/vm/emulation
		7	// services to run these tests.
		8	const running_glibc_ver: ?std.SemanticVersion = switch (builtin.os.tag) {
		9	.linux => builtin.os.version_range.linux.glibc,
		10	else => null,
		11	};
2		12
3	pub fn build(b: *std.Build) void {	13	pub fn build(b: *std.Build) void {
4	const test_step = b.step("test", "Test");	14	const test_step = b.step("test", "Test");
...	@@ -17,4 +27,95 @@ pub fn build(b: *std.Build) void {	...	@@ -17,4 +27,95 @@ pub fn build(b: *std.Build) void {
17	_ = exe.getEmittedBin();	27	_ = exe.getEmittedBin();
18	test_step.dependOn(&exe.step);	28	test_step.dependOn(&exe.step);
19	}	29	}
		30
		31	// Build & run against a sampling of supported glibc versions
		32	for ([_][]const u8{
		33	"native-linux-gnu.2.17", // Currently oldest supported, see #17769
		34	"native-linux-gnu.2.23",
		35	"native-linux-gnu.2.28",
		36	"native-linux-gnu.2.33",
		37	"native-linux-gnu.2.38",
		38	"native-linux-gnu",
		39	}) \|t\| {
		40	const target = b.resolveTargetQuery(std.Target.Query.parse(
		41	.{ .arch_os_abi = t },
		42	) catch unreachable);
		43
		44	const glibc_ver = target.result.os.version_range.linux.glibc;
		45
		46	const exe = b.addExecutable(.{
		47	.name = t,
		48	.root_source_file = .{ .path = "glibc_runtime_check.zig" },
		49	.target = target,
		50	});
		51	exe.linkLibC();
		52
		53	// Only try running the test if the host glibc is known to be good enough. Ideally, the Zig
		54	// test runner would be able to check this, but see https://github.com/ziglang/zig/pull/17702#issuecomment-1831310453
		55	if (running_glibc_ver) \|running_ver\| {
		56	if (glibc_ver.order(running_ver) == .lt) {
		57	const run_cmd = b.addRunArtifact(exe);
		58	run_cmd.skip_foreign_checks = true;
		59	run_cmd.expectExitCode(0);
		60
		61	test_step.dependOn(&run_cmd.step);
		62	}
		63	}
		64	const check = exe.checkObject();
		65
		66	// __errno_location is always a dynamically linked symbol
		67	check.checkInDynamicSymtab();
		68	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT __errno_location");
		69
		70	// before v2.32 fstatat redirects through __fxstatat, afterwards its a
		71	// normal dynamic symbol
		72	if (glibc_ver.order(.{ .major = 2, .minor = 32, .patch = 0 }) == .lt) {
		73	check.checkInDynamicSymtab();
		74	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT __fxstatat");
		75
		76	check.checkInSymtab();
		77	check.checkContains("FUNC LOCAL HIDDEN fstatat");
		78	} else {
		79	check.checkInDynamicSymtab();
		80	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT fstatat");
		81
		82	check.checkInSymtab();
		83	check.checkNotPresent("FUNC LOCAL HIDDEN fstatat");
		84	}
		85
		86	// before v2.26 reallocarray is not supported
		87	if (glibc_ver.order(.{ .major = 2, .minor = 26, .patch = 0 }) == .lt) {
		88	check.checkInDynamicSymtab();
		89	check.checkNotPresent("reallocarray");
		90	} else {
		91	check.checkInDynamicSymtab();
		92	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT reallocarray");
		93	}
		94
		95	// before v2.38 strlcpy is not supported
		96	if (glibc_ver.order(.{ .major = 2, .minor = 38, .patch = 0 }) == .lt) {
		97	check.checkInDynamicSymtab();
		98	check.checkNotPresent("strlcpy");
		99	} else {
		100	check.checkInDynamicSymtab();
		101	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT strlcpy");
		102	}
		103
		104	// v2.16 introduced getauxval(), so always present
		105	check.checkInDynamicSymtab();
		106	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT getauxval");
		107
		108	// Always have a dynamic "exit" reference
		109	check.checkInDynamicSymtab();
		110	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT exit");
		111
		112	// An atexit local symbol is defined, and depends on undefined dynamic
		113	// __cxa_atexit.
		114	check.checkInSymtab();
		115	check.checkContains("FUNC LOCAL HIDDEN atexit");
		116	check.checkInDynamicSymtab();
		117	check.checkExact("0 0 UND FUNC GLOBAL DEFAULT __cxa_atexit");
		118
		119	test_step.dependOn(&check.step);
		120	}
20	}	121	}

test/link/glibc_compat/glibc_runtime_check.zig created+116

...	@@ -0,0 +1,116 @@
1	// A zig test case that exercises some glibc symbols that have uncovered
2	// problems in the past. This test must be compiled against a glibc.
3	//
4	// The build.zig tests the binary built from this source to see that
5	// symbols are statically or dynamically linked, as expected.
6
7	const std = @import("std");
8	const builtin = @import("builtin");
9	const assert = std.debug.assert;
10
11	const c_malloc = @cImport(
12	@cInclude("malloc.h"), // for reallocarray
13	);
14
15	const c_stdlib = @cImport(
16	@cInclude("stdlib.h"), // for atexit
17	);
18
19	const c_string = @cImport(
20	@cInclude("string.h"), // for strlcpy
21	);
22
23	// Version of glibc this test is being built to run against
24	const glibc_ver = builtin.target.os.version_range.linux.glibc;
25
26	// PR #17034 - fstat moved between libc_nonshared and libc
27	fn checkStat() !void {
28	const cwdFd = std.fs.cwd().fd;
29
30	var stat = std.mem.zeroes(std.c.Stat);
31	var result = std.c.fstatat(cwdFd, "a_file_that_definitely_does_not_exist", &stat, 0);
32	assert(result == -1);
33	assert(std.c.getErrno(result) == .NOENT);
34
35	result = std.c.stat("a_file_that_definitely_does_not_exist", &stat);
36	assert(result == -1);
37	assert(std.c.getErrno(result) == .NOENT);
38	}
39
40	// PR #17607 - reallocarray not visible in headers
41	fn checkReallocarray() !void {
42	// reallocarray was introduced in v2.26
43	if (comptime glibc_ver.order(.{ .major = 2, .minor = 26, .patch = 0 }) == .lt) {
44	if (@hasDecl(c_malloc, "reallocarray")) {
45	@compileError("Before v2.26 'malloc.h' does not define 'reallocarray'");
46	}
47	} else {
48	return try checkReallocarray_v2_26();
49	}
50	}
51
52	fn checkReallocarray_v2_26() !void {
53	const size = 16;
54	const tenX = c_malloc.reallocarray(c_malloc.NULL, 10, size);
55	const elevenX = c_malloc.reallocarray(tenX, 11, size);
56
57	assert(tenX != c_malloc.NULL);
58	assert(elevenX != c_malloc.NULL);
59	}
60
61	// getauxval introduced in v2.16
62	fn checkGetAuxVal() !void {
63	if (comptime glibc_ver.order(.{ .major = 2, .minor = 16, .patch = 0 }) == .lt) {
64	if (@hasDecl(std.c, "getauxval")) {
65	@compileError("Before v2.16 glibc does not define 'getauxval'");
66	}
67	} else {
68	try checkGetAuxVal_v2_16();
69	}
70	}
71
72	fn checkGetAuxVal_v2_16() !void {
73	const base = std.c.getauxval(std.elf.AT_BASE);
74	const pgsz = std.c.getauxval(std.elf.AT_PAGESZ);
75
76	assert(base != 0);
77	assert(pgsz != 0);
78	}
79
80	// strlcpy introduced in v2.38, which is newer than many installed glibcs
81	fn checkStrlcpy() !void {
82	if (comptime glibc_ver.order(.{ .major = 2, .minor = 38, .patch = 0 }) == .lt) {
83	if (@hasDecl(c_string, "strlcpy")) {
84	@compileError("Before v2.38 glibc does not define 'strlcpy'");
85	}
86	} else {
87	try checkStrlcpy_v2_38();
88	}
89	}
90
91	fn checkStrlcpy_v2_38() !void {
92	var buf: [99]u8 = undefined;
93	const used = c_string.strlcpy(&buf, "strlcpy works!", buf.len);
94	assert(used == 15);
95	}
96
97	// atexit is part of libc_nonshared, so ensure its linked in correctly
98	fn forceExit0Callback() callconv(.C) void {
99	std.c.exit(0); // Override the main() exit code
100	}
101
102	fn checkAtExit() !void {
103	const result = c_stdlib.atexit(forceExit0Callback);
104	assert(result == 0);
105	}
106
107	pub fn main() !u8 {
108	try checkStat();
109	try checkReallocarray();
110	try checkStrlcpy();
111
112	try checkGetAuxVal();
113	try checkAtExit();
114
115	std.c.exit(1); // overridden by atexit() callback
116	}

author	Andrew Kelley <andrew@ziglang.org> 2024-01-04 16:28:39-08:00
committer	GitHub <noreply@github.com> 2024-01-04 16:28:39-08:00
log	45836678d76014f94d35a2ffea983c21a57426c4
tree	2cdeb8469c1cda5b6d50b86f38d87c4b5a3ea2b1
parent	d3a163f86845bcc7d20e5fd54174e480d1a8ac33
parent	362460ec24d802e6fba7f45ddff5f969642839df
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #17702 from rootbeer/correct-libc-nonshared