From 6af6c3c9791b655b3adca08749baf89404b081ae Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 28 Feb 2021 21:59:45 -0700 Subject: [PATCH] update i386 assembly to satisify llvm12 Without this, LLVM 12 says: error: ambiguous instructions require an explicit suffix (could be 'retw', or 'retl') --- lib/std/special/c.zig | 2 +- lib/std/special/compiler_rt/stack_probe.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/std/special/c.zig b/lib/std/special/c.zig index 51cbafc133f47b9cb01ce9a4b2756a40e04129c3..9fbab0e8deebb6df1dec6c0ecf8cfc9d226796be 100644 --- a/lib/std/special/c.zig +++ b/lib/std/special/c.zig @@ -325,7 +325,7 @@ fn clone() callconv(.Naked) void { \\ pop %%esi \\ pop %%ebx \\ pop %%ebp - \\ ret + \\ retw ); }, .x86_64 => { diff --git a/lib/std/special/compiler_rt/stack_probe.zig b/lib/std/special/compiler_rt/stack_probe.zig index d0dcd7055075eba0ea2a7649b334da685b93bf8d..b8b40a2b0f26d450fd751e4e155a6d380e8fddd5 100644 --- a/lib/std/special/compiler_rt/stack_probe.zig +++ b/lib/std/special/compiler_rt/stack_probe.zig @@ -53,7 +53,7 @@ pub fn zig_probe_stack() callconv(.Naked) void { \\ orl $0,8(%%esp) \\ add %%eax,%%esp \\ pop %%ecx - \\ ret + \\ retw ); }, else => {}, -- 2.54.0