From fe468e4fa3538ad4de7c890b4d971f74092d9f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 28 Sep 2025 16:14:02 +0200 Subject: [PATCH] std.os.linux: delete restore and restore_rt for hexagon, loongarch, mips, riscv --- lib/std/os/linux/hexagon.zig | 10 ---------- lib/std/os/linux/loongarch64.zig | 11 ----------- lib/std/os/linux/mips.zig | 16 ---------------- lib/std/os/linux/mips64.zig | 16 ---------------- lib/std/os/linux/riscv32.zig | 10 ---------- lib/std/os/linux/riscv64.zig | 10 ---------- 6 files changed, 73 deletions(-) diff --git a/lib/std/os/linux/hexagon.zig b/lib/std/os/linux/hexagon.zig index 0568173cdf..255faba20f 100644 --- a/lib/std/os/linux/hexagon.zig +++ b/lib/std/os/linux/hexagon.zig @@ -128,16 +128,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub const restore = restore_rt; - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ trap0(#0) - : - : [number] "{r6}" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const F = struct { pub const DUPFD = 0; pub const GETFD = 1; diff --git a/lib/std/os/linux/loongarch64.zig b/lib/std/os/linux/loongarch64.zig index 5a237739bb..b6ff38fccd 100644 --- a/lib/std/os/linux/loongarch64.zig +++ b/lib/std/os/linux/loongarch64.zig @@ -135,17 +135,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub const restore = restore_rt; - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ or $a7, $zero, %[number] - \\ syscall 0 - : - : [number] "r" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const msghdr = extern struct { name: ?*sockaddr, namelen: socklen_t, diff --git a/lib/std/os/linux/mips.zig b/lib/std/os/linux/mips.zig index 0958cf5a4b..c971bbd739 100644 --- a/lib/std/os/linux/mips.zig +++ b/lib/std/os/linux/mips.zig @@ -241,22 +241,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub fn restore() callconv(.naked) noreturn { - asm volatile ( - \\ syscall - : - : [number] "{$2}" (@intFromEnum(SYS.sigreturn)), - : .{ .r1 = true, .r3 = true, .r4 = true, .r5 = true, .r6 = true, .r7 = true, .r8 = true, .r9 = true, .r10 = true, .r11 = true, .r12 = true, .r13 = true, .r14 = true, .r15 = true, .r24 = true, .r25 = true, .hi = true, .lo = true, .memory = true }); -} - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ syscall - : - : [number] "{$2}" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const F = struct { pub const DUPFD = 0; pub const GETFD = 1; diff --git a/lib/std/os/linux/mips64.zig b/lib/std/os/linux/mips64.zig index bb05e26531..91fcacef38 100644 --- a/lib/std/os/linux/mips64.zig +++ b/lib/std/os/linux/mips64.zig @@ -220,22 +220,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub fn restore() callconv(.naked) noreturn { - asm volatile ( - \\ syscall - : - : [number] "{$2}" (@intFromEnum(SYS.rt_sigreturn)), - : .{ .r1 = true, .r3 = true, .r4 = true, .r5 = true, .r6 = true, .r7 = true, .r8 = true, .r9 = true, .r10 = true, .r11 = true, .r12 = true, .r13 = true, .r14 = true, .r15 = true, .r24 = true, .r25 = true, .hi = true, .lo = true, .memory = true }); -} - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ syscall - : - : [number] "{$2}" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const F = struct { pub const DUPFD = 0; pub const GETFD = 1; diff --git a/lib/std/os/linux/riscv32.zig b/lib/std/os/linux/riscv32.zig index c86882ad6c..01b6002135 100644 --- a/lib/std/os/linux/riscv32.zig +++ b/lib/std/os/linux/riscv32.zig @@ -135,16 +135,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub const restore = restore_rt; - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ ecall - : - : [number] "{x17}" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const F = struct { pub const DUPFD = 0; pub const GETFD = 1; diff --git a/lib/std/os/linux/riscv64.zig b/lib/std/os/linux/riscv64.zig index 028a1b2fbd..577cf3ec48 100644 --- a/lib/std/os/linux/riscv64.zig +++ b/lib/std/os/linux/riscv64.zig @@ -135,16 +135,6 @@ pub fn clone() callconv(.naked) usize { ); } -pub const restore = restore_rt; - -pub fn restore_rt() callconv(.naked) noreturn { - asm volatile ( - \\ ecall - : - : [number] "{x17}" (@intFromEnum(SYS.rt_sigreturn)), - ); -} - pub const F = struct { pub const DUPFD = 0; pub const GETFD = 1;