motiejus/zig
1
Fork 0
Code Releases Activity

std.process: Fix getBaseAddress() for linux + libc.

Browse Source 
In this case we should use the getauxval() from libc, not our own.
This commit is contained in:
Alex Rønne Petersen
2025-03-26 18:26:48 +01:00
parent b84db311d9
commit 0cf5f0d0b0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/std/process.zig
View File

@@ -1652,11 +1652,12 @@ pub fn posixGetUserInfo(name: []const u8) !UserInfo {
pub fn getBaseAddress() usize {
switch (native_os) {
.linux => {
const base = std.os.linux.getauxval(std.elf.AT_BASE);
const getauxval = if (builtin.link_libc) std.c.getauxval else std.os.linux.getauxval;
const base = getauxval(std.elf.AT_BASE);
if (base != 0) {
return base;
}
const phdr = std.os.linux.getauxval(std.elf.AT_PHDR);
const phdr = getauxval(std.elf.AT_PHDR);
return phdr - @sizeOf(std.elf.Ehdr);
},
.macos, .freebsd, .netbsd => {