diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2022-03-13 17:03:04 +0100 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2022-03-13 17:03:04 +0100 |
| commit | 76bceb240d837d859378e01cc5a40b00cb6aacdb (patch) | |
| tree | a8f3c756b97c7c21e24e9fc560b6be4d7abf5d9e /src | |
| parent | 4a2100e8208346d0812e8b2faf5baa3588fcba36 (diff) | |
| download | zig-76bceb240d837d859378e01cc5a40b00cb6aacdb.tar.gz zig-76bceb240d837d859378e01cc5a40b00cb6aacdb.zip | |
std+macho: revert and fix exposing Mach wrappers in std.os and std.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/MachO.zig | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig index c2e981a038..1a4bb804b8 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -4,7 +4,6 @@ const std = @import("std"); const build_options = @import("build_options"); const builtin = @import("builtin"); const assert = std.debug.assert; -const darwin = std.os.darwin; const fmt = std.fmt; const fs = std.fs; const log = std.log.scoped(.link); @@ -4344,8 +4343,8 @@ fn populateMissingMetadata(self: *MachO) !void { .vmaddr = pagezero_vmsize, .vmsize = needed_size, .filesize = needed_size, - .maxprot = darwin.PROT.READ | darwin.PROT.EXEC, - .initprot = darwin.PROT.READ | darwin.PROT.EXEC, + .maxprot = macho.PROT.READ | macho.PROT.EXEC, + .initprot = macho.PROT.READ | macho.PROT.EXEC, }, }, }); @@ -4449,8 +4448,8 @@ fn populateMissingMetadata(self: *MachO) !void { .vmsize = needed_size, .fileoff = fileoff, .filesize = needed_size, - .maxprot = darwin.PROT.READ | darwin.PROT.WRITE, - .initprot = darwin.PROT.READ | darwin.PROT.WRITE, + .maxprot = macho.PROT.READ | macho.PROT.WRITE, + .initprot = macho.PROT.READ | macho.PROT.WRITE, }, }, }); @@ -4498,8 +4497,8 @@ fn populateMissingMetadata(self: *MachO) !void { .vmsize = needed_size, .fileoff = fileoff, .filesize = needed_size, - .maxprot = darwin.PROT.READ | darwin.PROT.WRITE, - .initprot = darwin.PROT.READ | darwin.PROT.WRITE, + .maxprot = macho.PROT.READ | macho.PROT.WRITE, + .initprot = macho.PROT.READ | macho.PROT.WRITE, }, }, }); @@ -4607,8 +4606,8 @@ fn populateMissingMetadata(self: *MachO) !void { .segname = makeStaticString("__LINKEDIT"), .vmaddr = vmaddr, .fileoff = fileoff, - .maxprot = darwin.PROT.READ, - .initprot = darwin.PROT.READ, + .maxprot = macho.PROT.READ, + .initprot = macho.PROT.READ, }, }, }); |