From 2309d07e20fe99a4bac487978825bdfc65842b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 10 Oct 2024 22:14:40 +0200 Subject: [PATCH] std.os.linux: Use the Thumb-specific syscall helpers for thumbeb too. Fixes a "write to reserved register r7" compile error for thumbeb-linux-*. --- lib/std/os/linux.zig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig index dc734d0843..03eef2bb8e 100644 --- a/lib/std/os/linux.zig +++ b/lib/std/os/linux.zig @@ -29,11 +29,6 @@ test { } } -const syscall_bits = switch (native_arch) { - .thumb => @import("linux/thumb.zig"), - else => arch_bits, -}; - const arch_bits = switch (native_arch) { .x86 => @import("linux/x86.zig"), .x86_64 => @import("linux/x86_64.zig"), @@ -54,6 +49,9 @@ const arch_bits = switch (native_arch) { pub const getcontext = {}; }, }; + +const syscall_bits = if (native_arch.isThumb()) @import("linux/thumb.zig") else arch_bits; + pub const syscall0 = syscall_bits.syscall0; pub const syscall1 = syscall_bits.syscall1; pub const syscall2 = syscall_bits.syscall2;