zig

commit cc9634a2d3ac3ee7ec36e16ab9117aad6e2da625 (tree)
parent b5a5260546ddd8953e493f75c5ee12c5a853263b
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Thu, 27 Mar 2025 15:39:24 +0100

Merge pull request #23373 from alexrp/get-base-address

`std.process`: Some minor fixes for `getBaseAddress()`
Diffstat:
M
lib/std/process.zig
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/std/process.zig b/lib/std/process.zig
@@ -1652,14 +1652,15 @@ 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 => {
+        .driverkit, .ios, .macos, .tvos, .visionos, .watchos => {
             return @intFromPtr(&std.c._mh_execute_header);
         },
         .windows => return @intFromPtr(windows.kernel32.GetModuleHandleW(null)),