diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-02-27 19:49:00 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-02-28 14:51:56 -0500 |
| commit | 3683ba87ac5e5dfb6ea65c21c9fb714ed0582124 (patch) | |
| tree | 4f46634e9c253a42bd33c763991d2957afd8a4d7 /lib/std/dynamic_library.zig | |
| parent | fd006c1c74a43827a6f1c32e289ba57cafa874be (diff) | |
| download | zig-3683ba87ac5e5dfb6ea65c21c9fb714ed0582124.tar.gz zig-3683ba87ac5e5dfb6ea65c21c9fb714ed0582124.zip | |
complete the native target detection based on /usr/bin/env
Diffstat (limited to 'lib/std/dynamic_library.zig')
| -rw-r--r-- | lib/std/dynamic_library.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/dynamic_library.zig b/lib/std/dynamic_library.zig index 34f45894fb..0d14f8d032 100644 --- a/lib/std/dynamic_library.zig +++ b/lib/std/dynamic_library.zig @@ -82,12 +82,12 @@ pub fn linkmap_iterator(phdrs: []elf.Phdr) !LinkMap.Iterator { for (dyn_table) |*dyn| { switch (dyn.d_tag) { elf.DT_DEBUG => { - const r_debug = @intToPtr(*RDebug, dyn.d_un.d_ptr); + const r_debug = @intToPtr(*RDebug, dyn.d_val); if (r_debug.r_version != 1) return error.InvalidExe; break :init r_debug.r_map; }, elf.DT_PLTGOT => { - const got_table = @intToPtr([*]usize, dyn.d_un.d_ptr); + const got_table = @intToPtr([*]usize, dyn.d_val); // The address to the link_map structure is stored in the // second slot break :init @intToPtr(?*LinkMap, got_table[1]); |