Merge remote-tracking branch 'origin/master' into zld-incr

1 files changed, 18 insertions, 18 deletions

diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig
index 3c0a53612c..1fe8ca89d2 100644
--- a/lib/std/Thread.zig
+++ b/lib/std/Thread.zig
@@ -558,7 +558,7 @@ const PosixThreadImpl = struct {
             .openbsd => {
                 var count: c_int = undefined;
                 var count_size: usize = @sizeOf(c_int);
-                const mib = [_]c_int{ os.CTL_HW, os.HW_NCPUONLINE };
+                const mib = [_]c_int{ os.CTL.HW, os.system.HW_NCPUONLINE };
                 os.sysctl(&mib, &count, &count_size, null, 0) catch |err| switch (err) {
                     error.NameTooLong, error.UnknownName => unreachable,
                     else => |e| return e,
@@ -700,7 +700,7 @@ const LinuxThreadImpl = struct {
                     \\  int $128
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .x86_64 => asm volatile (
@@ -713,7 +713,7 @@ const LinuxThreadImpl = struct {
                     \\  syscall
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .arm, .armeb, .thumb, .thumbeb => asm volatile (
@@ -726,7 +726,7 @@ const LinuxThreadImpl = struct {
                     \\  svc 0
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .aarch64, .aarch64_be, .aarch64_32 => asm volatile (
@@ -739,7 +739,7 @@ const LinuxThreadImpl = struct {
                     \\  svc 0
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .mips, .mipsel => asm volatile (
@@ -753,7 +753,7 @@ const LinuxThreadImpl = struct {
                     \\  syscall
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .mips64, .mips64el => asm volatile (
@@ -766,7 +766,7 @@ const LinuxThreadImpl = struct {
                     \\  syscall
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .powerpc, .powerpcle, .powerpc64, .powerpc64le => asm volatile (
@@ -780,7 +780,7 @@ const LinuxThreadImpl = struct {
                     \\  blr
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .riscv64 => asm volatile (
@@ -793,7 +793,7 @@ const LinuxThreadImpl = struct {
                     \\  ecall
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 .sparcv9 => asm volatile (
@@ -821,7 +821,7 @@ const LinuxThreadImpl = struct {
                     \\  t 0x6d
                     :
                     : [ptr] "r" (@ptrToInt(self.mapped.ptr)),
-                      [len] "r" (self.mapped.len)
+                      [len] "r" (self.mapped.len),
                     : "memory"
                 ),
                 else => |cpu_arch| @compileError("Unsupported linux arch: " ++ @tagName(cpu_arch)),
@@ -877,8 +877,8 @@ const LinuxThreadImpl = struct {
         const mapped = os.mmap(
             null,
             map_bytes,
-            os.PROT_NONE,
-            os.MAP_PRIVATE | os.MAP_ANONYMOUS,
+            os.PROT.NONE,
+            os.MAP.PRIVATE | os.MAP.ANONYMOUS,
             -1,
             0,
         ) catch |err| switch (err) {
@@ -893,7 +893,7 @@ const LinuxThreadImpl = struct {
         // map everything but the guard page as read/write
         os.mprotect(
             mapped[guard_offset..],
-            os.PROT_READ | os.PROT_WRITE,
+            os.PROT.READ | os.PROT.WRITE,
         ) catch |err| switch (err) {
             error.AccessDenied => unreachable,
             else => |e| return e,
@@ -923,10 +923,10 @@ const LinuxThreadImpl = struct {
             .thread = .{ .mapped = mapped },
         };
 
-        const flags: u32 = os.CLONE_THREAD | os.CLONE_DETACHED |
-            os.CLONE_VM | os.CLONE_FS | os.CLONE_FILES |
-            os.CLONE_PARENT_SETTID | os.CLONE_CHILD_CLEARTID |
-            os.CLONE_SIGHAND | os.CLONE_SYSVSEM | os.CLONE_SETTLS;
+        const flags: u32 = linux.CLONE.THREAD | linux.CLONE.DETACHED |
+            linux.CLONE.VM | linux.CLONE.FS | linux.CLONE.FILES |
+            linux.CLONE.PARENT_SETTID | linux.CLONE.CHILD_CLEARTID |
+            linux.CLONE.SIGHAND | linux.CLONE.SYSVSEM | linux.CLONE.SETTLS;
 
         switch (linux.getErrno(linux.clone(
             Instance.entryFn,
@@ -978,7 +978,7 @@ const LinuxThreadImpl = struct {
 
             switch (linux.getErrno(linux.futex_wait(
                 &self.thread.child_tid.value,
-                linux.FUTEX_WAIT,
+                linux.FUTEX.WAIT,
                 tid,
                 null,
             ))) {