authorgravatar for semarie@online.frSébastien Marie <semarie@online.fr> 2020-10-25 11:13:42+00:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-25 20:46:28-04:00
log2a0a11aa6632aa3180ebb1c528b0d1fcb970d5ff
treed73b4892d277071da3c9daa6675a4483ef621bf2
parent0088efc4b22645698faf328369a1deca2dc9070f

openbsd: make dl_phdr_info cross arches

introduce Addr and Half definition to std.elf, and use them for dl_phdr_info

2 files changed, 12 insertions(+), 2 deletions(-)

lib/std/elf.zig+10
......@@ -937,6 +937,16 @@ pub const Verdaux = switch (@sizeOf(usize)) {
937937 8 => Elf64_Verdaux,
938938 else => @compileError("expected pointer size of 32 or 64"),
939939};
940pub const Addr = switch (@sizeOf(usize)) {
941 4 => Elf32_Addr,
942 8 => Elf64_Addr,
943 else => @compileError("expected pointer size of 32 or 64"),
944};
945pub const Half = switch (@sizeOf(usize)) {
946 4 => Elf32_Half,
947 8 => Elf64_Half,
948 else => @compileError("expected pointer size of 32 or 64"),
949};
940950
941951/// Machine architectures
942952/// See current registered ELF machine architectures at:
lib/std/os/bits/openbsd.zig+2-2
......@@ -33,10 +33,10 @@ pub const Kevent = extern struct {
3333};
3434
3535pub const dl_phdr_info = extern struct {
36 dlpi_addr: usize,
36 dlpi_addr: std.elf.Addr,
3737 dlpi_name: ?[*:0]const u8,
3838 dlpi_phdr: [*]std.elf.Phdr,
39 dlpi_phnum: u16,
39 dlpi_phnum: std.elf.Half,
4040};
4141
4242pub const Flock = extern struct {