Commit 229800482d28c9d55abf116cb315c78adddabe11 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-03-07 15:28:26+00:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2024-03-08 08:02:44+00:00
log	229800482d28c9d55abf116cb315c78adddabe11
tree	9bd1854a4886ee6b16001bf32a3d07492efdf697
parent	14ab9fb1541dd7e273504eec1417c4645f39a317
signature	Commit is signed but in an unrecognized format.

std.os.linux: do not use `usingnamespace` to define getauxval

This usage of `usingnamespace` was removed fairly trivially - the
resulting code is, IMO, more clear.

Eliminates one more usage of `usingnamespace` from the standard library.

1 files changed, 10 insertions(+), 9 deletions(-)

lib
- std
  - os
    linux.zig

lib/std/os/linux.zig+10-9

...	@@ -388,20 +388,21 @@ pub usingnamespace @import("linux/io_uring.zig");	...	@@ -388,20 +388,21 @@ pub usingnamespace @import("linux/io_uring.zig");
388	/// Set by startup code, used by `getauxval`.	388	/// Set by startup code, used by `getauxval`.
389	pub var elf_aux_maybe: ?[*]std.elf.Auxv = null;	389	pub var elf_aux_maybe: ?[*]std.elf.Auxv = null;
390		390
391	pub usingnamespace if (switch (builtin.zig_backend) {	391	const extern_getauxval = switch (builtin.zig_backend) {
392	// Calling extern functions is not yet supported with these backends	392	// Calling extern functions is not yet supported with these backends
393	.stage2_aarch64, .stage2_arm, .stage2_riscv64, .stage2_sparc64 => false,	393	.stage2_aarch64, .stage2_arm, .stage2_riscv64, .stage2_sparc64 => false,
394	else => !builtin.link_libc,	394	else => !builtin.link_libc,
395	}) struct {	395	};
396	/// See `std.elf` for the constants.	396
397	/// This matches the libc getauxval function.	397	comptime {
398	pub extern fn getauxval(index: usize) usize;	398	if (extern_getauxval) {
399	comptime {
400	@export(getauxvalImpl, .{ .name = "getauxval", .linkage = .Weak });	399	@export(getauxvalImpl, .{ .name = "getauxval", .linkage = .Weak });
401	}	400	}
402	} else struct {	401	}
403	pub const getauxval = getauxvalImpl;	402
404	};	403	pub const getauxval = if (extern_getauxval) struct {
		404	extern fn getauxval(index: usize) usize;
		405	}.getauxval else getauxvalImpl;
405		406
406	fn getauxvalImpl(index: usize) callconv(.C) usize {	407	fn getauxvalImpl(index: usize) callconv(.C) usize {
407	const auxv = elf_aux_maybe orelse return 0;	408	const auxv = elf_aux_maybe orelse return 0;