From: Nathan Chancellor <nathan@kernel.org>
Date: Fri, 15 Aug 2025 01:31:40 +0000 (-0700)
Subject: x86/build: Remove cc-option from -mno-fp-ret-in-387
X-Git-Tag: v6.18-rc1~192^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a42d732c136d3466cd19fafa7317d3004430318;p=thirdparty%2Flinux.git

x86/build: Remove cc-option from -mno-fp-ret-in-387

This has been supported in GCC for forever and clang gained support for it as
an alias of '-mno-x87' in LLVM 14. Now that x86 requires LLVM 15 or newer
since

  7861640aac52 ("x86/build: Raise the minimum LLVM version to 15.0.0"),

this flag can be unconditionally added, saving a compiler invocation.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://github.com/llvm/llvm-project/commit/a9fba2be35db674971382e38b99a31403444d9bf
Link: https://lore.kernel.org/20250814-x86-min-ver-cleanups-v1-4-ff7f19457523@kernel.org
---

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 0c82a610fb547..1bbf943fe9e1b 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -148,7 +148,7 @@ else
 
         # Don't autogenerate traditional x87 instructions
         KBUILD_CFLAGS += -mno-80387
-        KBUILD_CFLAGS += $(call cc-option,-mno-fp-ret-in-387)
+        KBUILD_CFLAGS += -mno-fp-ret-in-387
 
         # By default gcc and clang use a stack alignment of 16 bytes for x86.
         # However the standard kernel entry on x86-64 leaves the stack on an