Commit 0fa3cfdb4a

Matthew Knight <mattnite@protonmail.com>
2020-08-22 21:08:01
Bpf: move under os/linux instead of bits (#6126)
* moved bpf syscall, added some bpf instructions and tests * had to move bpf out of bits so that a freestanding target could import it * removed line * fixed imports
master
1 parent 9605e53
Changed files (3)
lib
std
os
bits
linux.zig
linux
bpf.zig
linux.zig
lib/std/os/bits/linux.zig
@@ -24,7 +24,6 @@ pub usingnamespace switch (builtin.arch) {
 };
 
 pub usingnamespace @import("linux/netlink.zig");
-pub const BPF = @import("linux/bpf.zig");
 
 const is_mips = builtin.arch.isMIPS();
lib/std/os/bits/linux/bpf.zig → lib/std/os/linux/bpf.zig
@@ -4,10 +4,8 @@
 // The MIT license requires this copyright notice to be included in all copies
 // and substantial portions of the software.
 usingnamespace std.os;
-const std = @import("../../../std.zig");
+const std = @import("../../std.zig");
 const expectEqual = std.testing.expectEqual;
-const fd_t = std.os.fd_t;
-const pid_t = std.os.pid_t;
 
 // instruction classes
 pub const LD = 0x00;
lib/std/os/linux.zig
@@ -29,6 +29,7 @@ pub usingnamespace switch (builtin.arch) {
 };
 pub usingnamespace @import("bits.zig");
 pub const tls = @import("linux/tls.zig");
+pub const BPF = @import("linux/bpf.zig");
 
 /// Set by startup code, used by `getauxval`.
 pub var elf_aux_maybe: ?[*]std.elf.Auxv = null;