5 files changed, 63 insertions, 1 deletions
diff --git a/lib/std/os/linux/arm-eabi.zig b/lib/std/os/linux/arm-eabi.zig
index a15234d742..c7371fc28d 100644
--- a/lib/std/os/linux/arm-eabi.zig
+++ b/lib/std/os/linux/arm-eabi.zig
@@ -1,3 +1,5 @@
+usingnamespace @import("../bits.zig");
+
 pub fn syscall0(number: usize) usize {
     return asm volatile ("svc #0"
         : [ret] "={r0}" (-> usize)
@@ -94,3 +96,19 @@ pub extern fn getThreadPointer() usize {
         : [ret] "=r" (-> usize)
     );
 }
+
+pub nakedcc fn restore() void {
+    return asm volatile ("svc #0"
+        :
+        : [number] "{r7}" (usize(SYS_sigreturn))
+        : "memory"
+    );
+}
+
+pub nakedcc fn restore_rt() void {
+    return asm volatile ("svc #0"
+        :
+        : [number] "{r7}" (usize(SYS_rt_sigreturn))
+        : "memory"
+    );
+}
diff --git a/lib/std/os/linux/arm64.zig b/lib/std/os/linux/arm64.zig
index 28da9af1c6..b8d8a1636b 100644
--- a/lib/std/os/linux/arm64.zig
+++ b/lib/std/os/linux/arm64.zig
@@ -1,3 +1,5 @@
+usingnamespace @import("../bits.zig");
+
 pub fn syscall0(number: usize) usize {
     return asm volatile ("svc #0"
         : [ret] "={x0}" (-> usize)
@@ -85,3 +87,13 @@ pub fn syscall6(
 
 /// This matches the libc clone function.
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
+
+pub const restore = restore_rt;
+
+pub nakedcc fn restore_rt() void {
+    return asm volatile ("svc #0"
+        :
+        : [number] "{x8}" (usize(SYS_rt_sigreturn))
+        : "memory", "cc"
+    );
+}
diff --git a/lib/std/os/linux/mipsel.zig b/lib/std/os/linux/mipsel.zig
index 09826753b8..b9a3120096 100644
--- a/lib/std/os/linux/mipsel.zig
+++ b/lib/std/os/linux/mipsel.zig
@@ -1,3 +1,5 @@
+usingnamespace @import("../bits.zig");
+
 pub fn syscall0(number: usize) usize {
     return asm volatile (
         \\ syscall
@@ -122,3 +124,19 @@ pub fn syscall6(
 
 /// This matches the libc clone function.
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
+
+pub nakedcc fn restore() void {
+    return asm volatile ("syscall"
+        :
+        : [number] "{$2}" (usize(SYS_sigreturn))
+        : "memory", "cc", "$7"
+    );
+}
+
+pub nakedcc fn restore_rt() void {
+    return asm volatile ("syscall"
+        :
+        : [number] "{$2}" (usize(SYS_rt_sigreturn))
+        : "memory", "cc", "$7"
+    );
+}
diff --git a/lib/std/os/linux/riscv64.zig b/lib/std/os/linux/riscv64.zig
index 7bfe0295d3..64facede89 100644
--- a/lib/std/os/linux/riscv64.zig
+++ b/lib/std/os/linux/riscv64.zig
@@ -1,3 +1,5 @@
+usingnamespace @import("../bits.zig");
+
 pub fn syscall0(number: usize) usize {
     return asm volatile ("ecall"
         : [ret] "={x10}" (-> usize)
@@ -84,3 +86,13 @@ pub fn syscall6(
 }
 
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
+
+pub const restore = restore_rt;
+
+pub nakedcc fn restore_rt() void {
+    return asm volatile ("ecall"
+        :
+        : [number] "{x17}" (usize(SYS_rt_sigreturn))
+        : "memory"
+    );
+}
diff --git a/lib/std/os/linux/x86_64.zig b/lib/std/os/linux/x86_64.zig
index 0f3a36636a..e0e4687c9f 100644
--- a/lib/std/os/linux/x86_64.zig
+++ b/lib/std/os/linux/x86_64.zig
@@ -88,10 +88,12 @@ pub fn syscall6(
 /// This matches the libc clone function.
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: usize, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
 
+pub const restore = restore_rt;
+
 pub nakedcc fn restore_rt() void {
     return asm volatile ("syscall"
         :
         : [number] "{rax}" (usize(SYS_rt_sigreturn))
-        : "rcx", "r11"
+        : "rcx", "r11", "memory"
     );
 }