motiejus/zig

commit 7ecbb6f3a07743669590f0c0e1767f49c7ca1fc3 (tree)
parent 3a836b4800337567735b2619075d8bb4e9f21c4d
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 20 Mar 2024 00:39:09 -0700

Merge pull request #19360 from ziglang/no-byos-posix

std: don't do BYOS at the POSIX API layer
Diffstat:
M
lib/std/os/linux.zig
 | 
4
++--
M
lib/std/posix.zig
 | 
8
++------

2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig
@@ -2264,7 +2264,7 @@ pub fn map_shadow_stack(addr: u64, size: u64, flags: u32) usize {
 }
 
 pub const E = switch (native_arch) {
-    .mips, .mipsel => enum(i32) {
+    .mips, .mipsel => enum(u16) {
         /// No error occurred.
         SUCCESS = 0,
 
@@ -2406,7 +2406,7 @@ pub const E = switch (native_arch) {
 
         pub const init = errnoFromSyscall;
     },
-    .sparc, .sparcel, .sparc64 => enum(i32) {
+    .sparc, .sparcel, .sparc64 => enum(u16) {
         /// No error occurred.
         SUCCESS = 0,
 
diff --git a/lib/std/posix.zig b/lib/std/posix.zig
@@ -39,12 +39,8 @@ const linux = std.os.linux;
 const windows = std.os.windows;
 const wasi = std.os.wasi;
 
-/// Applications can override the `system` API layer in their root source file.
-/// Otherwise, when linking libc, this is the C API.
-/// When not linking libc, it is the OS-specific system interface.
-pub const system = if (@hasDecl(root, "os") and @hasDecl(root.os, "system") and root.os != @This())
-    root.os.system
-else if (use_libc)
+/// A libc-compatible API layer.
+pub const system = if (use_libc)
     std.c
 else switch (native_os) {
     .linux => linux,