From 842de66db831e24476c381aeac625e340030c76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sat, 18 Oct 2025 02:21:59 +0200
Subject: [PATCH] std.os.linux: fix some issues in x32 inline asm

ref https://github.com/ziglang/zig/issues/22189
---
 lib/std/os/linux/x32.zig | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/lib/std/os/linux/x32.zig b/lib/std/os/linux/x32.zig
index 4335fac04b..ac596844d6 100644
--- a/lib/std/os/linux/x32.zig
+++ b/lib/std/os/linux/x32.zig
@@ -1,5 +1,3 @@
-// TODO: A lot of this file is very likely wrong.
-
 const builtin = @import("builtin");
 const std = @import("../../std.zig");
 const SYS = std.os.linux.SYS;
@@ -84,20 +82,20 @@ pub fn syscall6(
 
 pub fn clone() callconv(.naked) u32 {
     asm volatile (
-        \\      movl $56,%%eax // SYS_clone
-        \\      movq %%rdi,%%r11
-        \\      movq %%rdx,%%rdi
-        \\      movq %%r8,%%rdx
-        \\      movq %%r9,%%r8
-        \\      movq 8(%%rsp),%%r10
-        \\      movq %%r11,%%r9
-        \\      andq $-16,%%rsi
-        \\      subq $8,%%rsi
-        \\      movq %%rcx,(%%rsi)
+        \\      movl $0x40000038,%%eax // SYS_clone
+        \\      mov %%rdi,%%r11
+        \\      mov %%rdx,%%rdi
+        \\      mov %%r8,%%rdx
+        \\      mov %%r9,%%r8
+        \\      mov 8(%%rsp),%%r10
+        \\      mov %%r11,%%r9
+        \\      and $-16,%%rsi
+        \\      sub $8,%%rsi
+        \\      mov %%rcx,(%%rsi)
         \\      syscall
-        \\      testq %%rax,%%rax
+        \\      test %%eax,%%eax
         \\      jz 1f
-        \\      retq
+        \\      ret
         \\
         \\1:
     );
@@ -105,12 +103,12 @@ pub fn clone() callconv(.naked) u32 {
         \\      .cfi_undefined %%rip
     );
     asm volatile (
-        \\      xorl %%ebp,%%ebp
+        \\      xor %%ebp,%%ebp
         \\
-        \\      popq %%rdi
-        \\      callq *%%r9
-        \\      movl %%eax,%%edi
-        \\      movl $60,%%eax // SYS_exit
+        \\      pop %%rdi
+        \\      call *%%r9
+        \\      mov %%eax,%%edi
+        \\      movl $0x4000003c,%%eax // SYS_exit
         \\      syscall
         \\
     );